[Python-checkins] r78135 - in python/branches/py3k: Lib/test/test_unittest.py

[michael.foord]

Author: michael.foord
Date: Wed Feb 10 16:53:19 2010
New Revision: 78135

Log:
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
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_unittest.py

Modified: python/branches/py3k/Lib/test/test_unittest.py
==============================================================================
--- python/branches/py3k/Lib/test/test_unittest.py	(original)
+++ python/branches/py3k/Lib/test/test_unittest.py	Wed Feb 10 16:53:19 2010
@@ -2045,7 +2045,7 @@
         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 @@
 
     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 @@
         """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 '