mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-26 11:45:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 78132 via svnmerge from

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

........
  r78132 | michael.foord | 2010-02-10 15:50:58 +0000 (Wed, 10 Feb 2010) | 1 line

  Fix for unittest tests, to be merged to py3k
........
This commit is contained in:
Michael Foord 2010-02-10 15:53:19 +00:00
parent 0e31b992fa
commit 0b581e58f9
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/test/test_unittest.py
View file

@ -2045,7 +2045,7 @@ class Test_TestResult(TestCase):
self.assertIsInstance(formatted_exc, str) self.assertIsInstance(formatted_exc, str)
def testGetDescriptionWithoutDocstring(self): def testGetDescriptionWithoutDocstring(self):
result = unittest.TextTestResult(None, True, None) result = unittest.TextTestResult(None, True, 1)
self.assertEqual( self.assertEqual(
result.getDescription(self), result.getDescription(self),
'testGetDescriptionWithoutDocstring (' + __name__ + 'testGetDescriptionWithoutDocstring (' + __name__ +
@ -2053,7 +2053,7 @@ class Test_TestResult(TestCase):
def testGetDescriptionWithOneLineDocstring(self): def testGetDescriptionWithOneLineDocstring(self):
"""Tests getDescription() for a method with a docstring.""" """Tests getDescription() for a method with a docstring."""
result = unittest.TextTestResult(None, True, None) result = unittest.TextTestResult(None, True, 1)
self.assertEqual( self.assertEqual(
result.getDescription(self), result.getDescription(self),
('testGetDescriptionWithOneLineDocstring ' ('testGetDescriptionWithOneLineDocstring '
@ -2064,7 +2064,7 @@ class Test_TestResult(TestCase):
"""Tests getDescription() for a method with a longer docstring. """Tests getDescription() for a method with a longer docstring.
The second line of the docstring. The second line of the docstring.
""" """
result = unittest.TextTestResult(None, True, None) result = unittest.TextTestResult(None, True, 1)
self.assertEqual( self.assertEqual(
result.getDescription(self), result.getDescription(self),
('testGetDescriptionWithMultiLineDocstring ' ('testGetDescriptionWithMultiLineDocstring '