From: Michael Foord <fuzzyman@voidspace.org.uk>
Date: Wed, 10 Feb 2010 15:53:19 +0000 (+0000)
Subject: Merged revisions 78132 via svnmerge from
X-Git-Tag: v3.2a1~1708
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b581e58f96a3ef66858d6efd762dbae849d766c;p=python

Merged revisions 78132 via svnmerge from
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
index 0727931fde..8627312824 100644
--- a/Lib/test/test_unittest.py
+++ b/Lib/test/test_unittest.py
@@ -2045,7 +2045,7 @@ class Test_TestResult(TestCase):
         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__ +
@@ -2053,7 +2053,7 @@ class Test_TestResult(TestCase):
 
     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 @@ class Test_TestResult(TestCase):
         """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 '