Return-Path: 
 <allura-commits-return-1241-apmail-incubator-allura-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id AADACD62F
	for <apmail-incubator-allura-commits-archive@minotaur.apache.org>;
 Tue, 18 Dec 2012 04:29:42 +0000 (UTC)
Received: (qmail 16484 invoked by uid 500); 18 Dec 2012 04:29:35 -0000
Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org
Received: (qmail 16279 invoked by uid 500); 18 Dec 2012 04:29:35 -0000
Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:allura-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:allura-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:allura-commits@incubator.apache.org>
List-Id: <allura-commits.incubator.apache.org>
Reply-To: allura-dev@incubator.apache.org
Delivered-To: mailing list allura-commits@incubator.apache.org
Received: (qmail 15863 invoked by uid 99); 18 Dec 2012 04:29:29 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Dec 2012 04:29:29 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 41C0081E285; Tue, 18 Dec 2012 04:29:29 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: tvansteenburgh@apache.org
To: allura-commits@incubator.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: [7/41] git commit: [#5389] ticket:235 fix test
Message-Id: <20121218042929.41C0081E285@tyr.zones.apache.org>
Date: Tue, 18 Dec 2012 04:29:29 +0000 (UTC)

[#5389] ticket:235 fix test


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/92afc112
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/92afc112
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/92afc112

Branch: refs/heads/tv/4957
Commit: 92afc11224716bcd19c3031cd82478bd0afa4b7f
Parents: dc97791
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Tue Dec 11 13:02:03 2012 +0000
Committer: Cory Johns <johnsca@geek.net>
Committed: Mon Dec 17 22:21:17 2012 +0000

----------------------------------------------------------------------
 Allura/allura/tests/unit/test_utils.py |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/92afc112/Allura/allura/tests/unit/test_utils.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/test_utils.py b/Allura/allura/tests/unit/test_utils.py
index 55b4b45..e7e6338 100644
--- a/Allura/allura/tests/unit/test_utils.py
+++ b/Allura/allura/tests/unit/test_utils.py
@@ -135,8 +135,10 @@ class TestHtmlSideBySideDiff(unittest.TestCase):
         expected = '''
 <table class="side-by-side-diff">
   <thead>
-    <th colspan="2">file a</th>
-    <th colspan="2">file b</th>
+    <th class="lineno"></th>
+    <th>file a</th>
+    <th class="lineno"></th>
+    <th>file b</th>
   </thead>
 <tr>
   <td class="lineno">1</td>