From: Michael Foord <fuzzyman@voidspace.org.uk>
Date: Sun, 19 Dec 2010 04:07:28 +0000 (+0000)
Subject: Improvement to fix for issue 9926 to allow TestResult to be reused.
X-Git-Tag: v3.2b2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cca5be2e4c5b1a45f42e63e9b1a0a6c6a6647876;p=thirdparty%2FPython%2Fcpython.git

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 73f0e17f8a66..77ce08918730 100644
--- 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 fa32247013f3..2db978ddb8a9 100644
--- 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()