diff -r f2a7774e50e1 Lib/unittest/suite.py --- a/Lib/unittest/suite.py Sun Sep 30 01:27:18 2012 -0700 +++ b/Lib/unittest/suite.py Sun Sep 30 11:10:46 2012 +0100 @@ -57,11 +57,19 @@ self.addTest(test) def run(self, result): - for test in self: + for index, test in enumerate(self): if result.shouldStop: break test(result) + self._removeTestAtIndex(index) return result + + def _removeTestAtIndex(self, index): + try: + self._tests[index] = None + except TypeError: + # support for suite implementations that have overriden self._test + pass def __call__(self, *args, **kwds): return self.run(*args, **kwds) @@ -87,7 +95,7 @@ if getattr(result, '_testRunEntered', False) is False: result._testRunEntered = topLevel = True - for test in self: + for index, test in enumerate(self): if result.shouldStop: break @@ -105,6 +113,8 @@ test(result) else: test.debug() + + self._removeTestAtIndex(index) if topLevel: self._tearDownPreviousClass(None, result) diff -r f2a7774e50e1 Lib/unittest/test/test_setups.py --- a/Lib/unittest/test/test_setups.py Sun Sep 30 01:27:18 2012 -0700 +++ b/Lib/unittest/test/test_setups.py Sun Sep 30 11:10:46 2012 +0100 @@ -494,12 +494,10 @@ Test.__module__ = 'Module' sys.modules['Module'] = Module - _suite = unittest.defaultTestLoader.loadTestsFromTestCase(Test) - suite = unittest.TestSuite() - suite.addTest(_suite) - messages = ('setUpModule', 'tearDownModule', 'setUpClass', 'tearDownClass', 'test_something') for phase, msg in enumerate(messages): + _suite = unittest.defaultTestLoader.loadTestsFromTestCase(Test) + suite = unittest.TestSuite([_suite]) with self.assertRaisesRegex(Exception, msg): suite.debug() diff -r f2a7774e50e1 Lib/unittest/test/test_suite.py --- a/Lib/unittest/test/test_suite.py Sun Sep 30 01:27:18 2012 -0700 +++ b/Lib/unittest/test/test_suite.py Sun Sep 30 11:10:46 2012 +0100 @@ -1,6 +1,8 @@ import unittest +import gc import sys +import weakref from .support import LoggingResult, TestEquality @@ -300,7 +302,49 @@ # when the bug is fixed this line will not crash suite.run(unittest.TestResult()) + def test_remove_test_at_index(self): + suite = unittest.TestSuite() + + suite._tests = [1, 2, 3] + suite._removeTestAtIndex(1) + + self.assertEqual(suite._tests[1], None) + def test_remove_test_at_index_not_indexable(self): + suite = unittest.TestSuite() + suite._tests = None + + # if _removeAtIndex raises for noniterables this next line will break + suite._removeTestAtIndex(2) + + def assert_garbage_collect_test_after_run(self, TestSuiteClass): + + class Foo(unittest.TestCase): + def test_nothing(self): + pass + + test = Foo('test_nothing') + wref = weakref.ref(test) + + suite = TestSuiteClass([wref()]) + suite.run(unittest.TestResult()) + + del test + + # for the benefit of non-reference counting implementations + gc.collect() + + self.assertEqual(suite._tests, [None]) + self.assertIsNone(wref()) + + def test_garbage_collect_test_after_run_BaseTestSuite(self): + + self.assert_garbage_collect_test_after_run(unittest.BaseTestSuite) + + def test_garbage_collect_test_after_run_TestSuite(self): + + self.assert_garbage_collect_test_after_run(unittest.TestSuite) + def test_basetestsuite(self): class Test(unittest.TestCase):