[Python-checkins] r87405 - in python/branches/release27-maint/Lib/unittest: suite.py test/test_suite.py

[michael.foord]

Author: michael.foord
Date: Sun Dec 19 15:12:23 2010
New Revision: 87405

Log:
Improvement to fix for issue 9926 to allow TestResult to be reused.

Modified:
   python/branches/release27-maint/Lib/unittest/suite.py
   python/branches/release27-maint/Lib/unittest/test/test_suite.py

Modified: python/branches/release27-maint/Lib/unittest/suite.py
==============================================================================
--- python/branches/release27-maint/Lib/unittest/suite.py	(original)
+++ python/branches/release27-maint/Lib/unittest/suite.py	Sun Dec 19 15:12:23 2010
@@ -107,6 +107,7 @@
         if topLevel:
             self._tearDownPreviousClass(None, result)
             self._handleModuleTearDown(result)
+            result._testRunEntered = False
         return result
 
     def debug(self):

Modified: python/branches/release27-maint/Lib/unittest/test/test_suite.py
==============================================================================
--- python/branches/release27-maint/Lib/unittest/test/test_suite.py	(original)
+++ python/branches/release27-maint/Lib/unittest/test/test_suite.py	Sun Dec 19 15:12:23 2010
@@ -353,11 +353,15 @@
                 unittest.TestSuite.__call__(self, *args, **kw)
 
         suite = MySuite()
+        result = unittest.TestResult()
         wrapper = unittest.TestSuite()
         wrapper.addTest(suite)
-        wrapper(unittest.TestResult())
+        wrapper(result)
         self.assertTrue(suite.called)
 
+        # reusing results should be permitted even if abominable
+        self.assertFalse(result._testRunEntered)
+
 
 if __name__ == '__main__':
     unittest.main()