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

diff --git a/Lib/unittest/suite.py b/Lib/unittest/suite.py
index 73f0e17f8a661f9c55ab3675e12c18eab24d0de1..77ce089187305b74630d40b7a0ce75e80ae54aa0 100644 (file)
--- a/Lib/unittest/suite.py
+++ b/Lib/unittest/suite.py
@@ -104,6 +104,7 @@ class TestSuite(BaseTestSuite):
         if topLevel:
             self._tearDownPreviousClass(None, result)
             self._handleModuleTearDown(result)
+            result._testRunEntered = False
         return result
 
     def debug(self):

diff --git a/Lib/unittest/test/test_suite.py b/Lib/unittest/test/test_suite.py
index fa32247013f39dacf2728e3ee97463d9c768121a..2db978ddb8a9a21a1f6a9c2f4a3e46e3a10755c9 100644 (file)
--- a/Lib/unittest/test/test_suite.py
+++ b/Lib/unittest/test/test_suite.py
@@ -353,11 +353,16 @@ class Test_TestSuite(unittest.TestCase, TestEquality):
                 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()