cpython: 39781c3737f8 (original) (raw)

Mercurial > cpython

changeset 85490:39781c3737f8

Issue #11798: fix tests for regrtest -R : [#11798]

line wrap: on

line diff

--- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -496,6 +496,8 @@ def main(tests=None, **kwargs): if ns.slaveargs is not None: args, kwargs = json.loads(ns.slaveargs)

•    if kwargs.get('huntrleaks'):[](#l1.7)

•        unittest.BaseTestSuite._cleanup = False[](#l1.8)
     try:[](#l1.9)
         result = runtest(*args, **kwargs)[](#l1.10)
     except KeyboardInterrupt:[](#l1.11)

@@ -528,6 +530,9 @@ def main(tests=None, **kwargs): #gc.set_debug(gc.DEBUG_SAVEALL) found_garbage = []

• if ns.huntrleaks:

•    unittest.BaseTestSuite._cleanup = False[](#l1.17)

+ if ns.single: filename = os.path.join(TEMPDIR, 'pynexttest') try:

--- a/Lib/unittest/suite.py +++ b/Lib/unittest/suite.py @@ -16,6 +16,8 @@ def _call_if_exists(parent, attr): class BaseTestSuite(object): """A simple test suite that doesn't provide class or module shared fixtures. """

• _cleanup = True

+ def init(self, tests=()): self._tests = [] self.addTests(tests) @@ -61,7 +63,8 @@ class BaseTestSuite(object): if result.shouldStop: break test(result)

•        self._removeTestAtIndex(index)[](#l2.16)

•        if self._cleanup:[](#l2.17)

•            self._removeTestAtIndex(index)[](#l2.18)
     return result[](#l2.19)

def _removeTestAtIndex(self, index): @@ -115,7 +118,8 @@ class TestSuite(BaseTestSuite): else: test.debug()

•        self._removeTestAtIndex(index)[](#l2.26)

•        if self._cleanup:[](#l2.27)

•            self._removeTestAtIndex(index)[](#l2.28)

if topLevel: self._tearDownPreviousClass(None, result)

--- a/Lib/unittest/test/test_suite.py +++ b/Lib/unittest/test/test_suite.py @@ -303,6 +303,9 @@ class Test_TestSuite(unittest.TestCase, suite.run(unittest.TestResult()) def test_remove_test_at_index(self):

•    if not unittest.BaseTestSuite._cleanup:[](#l3.7)

•        raise unittest.SkipTest("Suite cleanup is disabled")[](#l3.8)

+ suite = unittest.TestSuite() suite._tests = [1, 2, 3] @@ -311,6 +314,9 @@ class Test_TestSuite(unittest.TestCase, self.assertEqual([1, None, 3], suite._tests) def test_remove_test_at_index_not_indexable(self):

•    if not unittest.BaseTestSuite._cleanup:[](#l3.17)

•        raise unittest.SkipTest("Suite cleanup is disabled")[](#l3.18)

+ suite = unittest.TestSuite() suite._tests = None @@ -318,6 +324,8 @@ class Test_TestSuite(unittest.TestCase, suite._removeTestAtIndex(2) def assert_garbage_collect_test_after_run(self, TestSuiteClass):

•    if not unittest.BaseTestSuite._cleanup:[](#l3.27)

•        raise unittest.SkipTest("Suite cleanup is disabled")[](#l3.28)

class Foo(unittest.TestCase): def test_nothing(self):