diff options
| author | Michael Foord <fuzzyman@voidspace.org.uk> | 2010-06-05 13:57:23 (GMT) |
|---|---|---|
| committer | Michael Foord <fuzzyman@voidspace.org.uk> | 2010-06-05 13:57:23 (GMT) |
| commit | ac76074628b0a3aea78cc85c79034bb7d04b68f4 (patch) | |
| tree | 8b73eb5504a859366fbaac46ba041ab079055d77 /Lib/unittest | |
| parent | 9dad32efe8e63cda4de3b53004598d2c1f6aa129 (diff) | |
| download | cpython-ac76074628b0a3aea78cc85c79034bb7d04b68f4.zip cpython-ac76074628b0a3aea78cc85c79034bb7d04b68f4.tar.gz cpython-ac76074628b0a3aea78cc85c79034bb7d04b68f4.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib/unittest')
| -rw-r--r-- | Lib/unittest/case.py | 2 | ||||
| -rw-r--r-- | Lib/unittest/test/test_case.py | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py index fcb756d..3a87a2f 100644 --- 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 7de7931..8345443 100644 --- 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) |