Merged revisions 81753 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81753 | michael.foord | 2010-06-05 14:48:27 +0100 (Sat, 05 Jun 2010) | 1 line

  Fix unittest tests after previous commit.
........

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index fcb756d3fbc9ddc9e936a4d65ff24833e1a78d2e..3a87a2fa3fd0f5688797a113bdb711e7ea14d6e0 100644 (file)
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -936,7 +936,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 7de79310ed49116ccce6593cef387311eaea7ce5..8345443c07a5b155214e0ef4bc3411b7b54fe763 100644 (file)
--- a/Lib/unittest/test/test_case.py
+++ b/Lib/unittest/test/test_case.py
@@ -776,7 +776,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 = """
+        sample_text_error = """\
 - http://www.python.org/doc/2.3/lib/module-unittest.html
 ?                             ^
 + http://www.python.org/doc/2.4.1/lib/module-unittest.html
@@ -787,13 +787,16 @@ test case
 ?                                                       +++++++++++++++++++++
 +     own implementation that does not subclass from TestCase, of course.
 """
-
+        self.maxDiff = None
         try:
             self.assertMultiLineEqual(sample_text, revised_sample_text)
         except self.failureException as e:
+            # need to remove the first line of the error message
+            error = str(e).split('\n', 1)[1]
+
             # no fair testing ourself with ourself, and assertEqual is used for strings
             # so can't use assertEqual either. Just use assertTrue.
-            self.assertTrue(sample_text_error == str(e))
+            self.assertTrue(sample_text_error == error)
 
     def testAssertIsNone(self):
         self.assertIsNone(None)