Merged revisions 78132 via svnmerge from

Michael Foord · Michael Foord · commit 0b581e58f96a · 2010-02-10T15:53:19.000Z
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
........
diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
@@ -2045,15 +2045,15 @@ def test_1(self):
         self.assertIsInstance(formatted_exc, str)
 
     def testGetDescriptionWithoutDocstring(self):
-        result = unittest.TextTestResult(None, True, None)
+        result = unittest.TextTestResult(None, True, 1)
         self.assertEqual(
                 result.getDescription(self),
                 'testGetDescriptionWithoutDocstring (' + __name__ +
                 '.Test_TestResult)')
 
     def testGetDescriptionWithOneLineDocstring(self):
         """Tests getDescription() for a method with a docstring."""
-        result = unittest.TextTestResult(None, True, None)
+        result = unittest.TextTestResult(None, True, 1)
         self.assertEqual(
                 result.getDescription(self),
                ('testGetDescriptionWithOneLineDocstring '
@@ -2064,7 +2064,7 @@ def testGetDescriptionWithMultiLineDocstring(self):
         """Tests getDescription() for a method with a longer docstring.
         The second line of the docstring.
         """
-        result = unittest.TextTestResult(None, True, None)
+        result = unittest.TextTestResult(None, True, 1)
         self.assertEqual(
                 result.getDescription(self),
                ('testGetDescriptionWithMultiLineDocstring '
