From: Michael Foord <fuzzyman@voidspace.org.uk>
Date: Sat, 10 Jul 2010 13:51:42 +0000 (+0000)
Subject: Fix error message for comparing single line strings in unittest.TestCase.assertEqual.
X-Git-Tag: v2.7.1rc1~622
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=94f071c7158e8751063a9692bc86a4122b0a717a;p=thirdparty%2FPython%2Fcpython.git

Fix error message for comparing single line strings in unittest.TestCase.assertEqual.
Issue 9174
---

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index 85ff002e7176..28a68e8167ad 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -895,9 +895,14 @@ class TestCase(object):
                 'Second argument is not a string'))
 
         if first != second:
-            standardMsg = '%s != %s' % (safe_repr(first, True), safe_repr(second, True))
-            diff = '\n' + ''.join(difflib.ndiff(first.splitlines(True),
-                                                       second.splitlines(True)))
+            firstlines = first.splitlines(True)
+            secondlines = second.splitlines(True)
+            if len(firstlines) == 1 and first.strip('\r\n') == first:
+                firstlines = [first + '\n']
+                secondlines = [second + '\n']
+            standardMsg = '%s != %s' % (safe_repr(first, True),
+                                        safe_repr(second, True))
+            diff = '\n' + ''.join(difflib.ndiff(firstlines, secondlines))
             standardMsg = self._truncateMessage(standardMsg, diff)
             self.fail(self._formatMessage(msg, standardMsg))
 
diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py
index a395fe07d675..4e9dfc69010f 100644
--- a/Lib/unittest/test/test_case.py
+++ b/Lib/unittest/test/test_case.py
@@ -874,6 +874,21 @@ test case
                 # unicode strings - so we can't use it for this check
                 self.assertTrue(sample_text_error == error)
 
+    def testAsertEqualSingleLine(self):
+        sample_text = u"laden swallows fly slowly"
+        revised_sample_text = u"unladen swallows fly quickly"
+        sample_text_error = """\
+- laden swallows fly slowly
+?                    ^^^^
++ unladen swallows fly quickly
+? ++                   ^^^^^
+"""
+        try:
+            self.assertEqual(sample_text, revised_sample_text)
+        except self.failureException as e:
+            error = str(e).split('\n', 1)[1]
+            self.assertTrue(sample_text_error == error)
+
     def testAssertIsNone(self):
         self.assertIsNone(None)
         self.assertRaises(self.failureException, self.assertIsNone, False)