Kaydet (Commit) 22d4e8fb authored tarafından Victor Stinner's avatar Victor Stinner Kaydeden (comit) GitHub

bpo-30813: Fix unittest when hunting refleaks (#2502) (#2505)

bpo-11798, bpo-16662, bpo-16935, bpo-30813: Skip
test_discover_with_module_that_raises_SkipTest_on_import() and
test_discover_with_init_module_that_raises_SkipTest_on_import() of
test_unittest when hunting reference leaks using regrtest.
(cherry picked from commit e4f9a2d2)
üst d0aac5da
...@@ -528,6 +528,9 @@ class TestDiscovery(unittest.TestCase): ...@@ -528,6 +528,9 @@ class TestDiscovery(unittest.TestCase):
pickle.loads(pickle.dumps(test, proto)) pickle.loads(pickle.dumps(test, proto))
def test_discover_with_module_that_raises_SkipTest_on_import(self): def test_discover_with_module_that_raises_SkipTest_on_import(self):
if not unittest.BaseTestSuite._cleanup:
raise unittest.SkipTest("Suite cleanup is disabled")
loader = unittest.TestLoader() loader = unittest.TestLoader()
def _get_module_from_name(name): def _get_module_from_name(name):
...@@ -548,6 +551,9 @@ class TestDiscovery(unittest.TestCase): ...@@ -548,6 +551,9 @@ class TestDiscovery(unittest.TestCase):
pickle.loads(pickle.dumps(suite, proto)) pickle.loads(pickle.dumps(suite, proto))
def test_discover_with_init_module_that_raises_SkipTest_on_import(self): def test_discover_with_init_module_that_raises_SkipTest_on_import(self):
if not unittest.BaseTestSuite._cleanup:
raise unittest.SkipTest("Suite cleanup is disabled")
vfs = {abspath('/foo'): ['my_package'], vfs = {abspath('/foo'): ['my_package'],
abspath('/foo/my_package'): ['__init__.py', 'test_module.py']} abspath('/foo/my_package'): ['__init__.py', 'test_module.py']}
self.setup_import_issue_package_tests(vfs) self.setup_import_issue_package_tests(vfs)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment