From: Michael Foord <fuzzyman@voidspace.org.uk>
Date: Sat, 5 Jun 2010 13:48:27 +0000 (+0000)
Subject: Fix unittest tests after previous commit.
X-Git-Tag: v2.7rc1~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2c25c5cb0225c8c4ffeff34ae72f4cd2b6fe102;p=python

Fix unittest tests after previous commit.
---

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index 08e8c1e964..48e2460241 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -891,7 +891,7 @@ class TestCase(object):
                 'Second argument is not a string'))
 
         if first != second:
-            standardMsg = '%s != %s' % (safe_repr(d1, True), safe_repr(d2, True))
+            standardMsg = '%s != %s' % (safe_repr(first, True), safe_repr(second, True))
             diff = '\n' + ''.join(difflib.ndiff(first.splitlines(True),
                                                        second.splitlines(True)))
             standardMsg = self._truncateMessage(standardMsg, diff)
diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py
index 840defdfff..92ede2016b 100644
--- a/Lib/unittest/test/test_case.py
+++ b/Lib/unittest/test/test_case.py
@@ -807,7 +807,7 @@ test case
     A test case is the smallest unit of testing. [...] You may provide your
     own implementation that does not subclass from TestCase, of course.
 """
-        sample_text_error = b"""
+        sample_text_error = b"""\
 - http://www.python.org/doc/2.3/lib/module-unittest.html
 ?                             ^
 + http://www.python.org/doc/2.4.1/lib/module-unittest.html
@@ -818,15 +818,18 @@ test case
 ?                                                       +++++++++++++++++++++
 +     own implementation that does not subclass from TestCase, of course.
 """
-
+        self.maxDiff = None
         for type_changer in (lambda x: x, lambda x: x.decode('utf8')):
             try:
                 self.assertMultiLineEqual(type_changer(sample_text),
                                           type_changer(revised_sample_text))
             except self.failureException, e:
+                # need to remove the first line of the error message
+                error = str(e).encode('utf8').split('\n', 1)[1]
+
                 # assertMultiLineEqual is hooked up as the default for
                 # unicode strings - so we can't use it for this check
-                self.assertTrue(sample_text_error == str(e).encode('utf8'))
+                self.assertTrue(sample_text_error == error)
 
     def testAssertIsNone(self):
         self.assertIsNone(None)