mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix unittest tests after previous commit.

Browse source
This commit is contained in:
Michael Foord 2010-06-05 13:48:27 +00:00
parent 5fe21ff91a
commit f2c25c5cb0
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/unittest/case.py
View file

@ -891,7 +891,7 @@ class TestCase(object):
'Second argument is not a string')) 'Second argument is not a string'))
if first != second: 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), diff = '\n' + ''.join(difflib.ndiff(first.splitlines(True),
second.splitlines(True))) second.splitlines(True)))
standardMsg = self._truncateMessage(standardMsg, diff) standardMsg = self._truncateMessage(standardMsg, diff)

9
Lib/unittest/test/test_case.py
View file

@ -807,7 +807,7 @@ test case
A test case is the smallest unit of testing. [...] You may provide your A test case is the smallest unit of testing. [...] You may provide your
own implementation that does not subclass from TestCase, of course. 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.3/lib/module-unittest.html
? ^ ? ^
+ http://www.python.org/doc/2.4.1/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. + 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')): for type_changer in (lambda x: x, lambda x: x.decode('utf8')):
try: try:
self.assertMultiLineEqual(type_changer(sample_text), self.assertMultiLineEqual(type_changer(sample_text),
type_changer(revised_sample_text)) type_changer(revised_sample_text))
except self.failureException, e: 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 # assertMultiLineEqual is hooked up as the default for
# unicode strings - so we can't use it for this check # 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): def testAssertIsNone(self):
self.assertIsNone(None) self.assertIsNone(None)