Skip to content

Commit 714afcc

Browse files
authored
bpo-30813: Fix unittest when hunting refleaks (#2502) (#2506)
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 e4f9a2d)
1 parent 5741b70 commit 714afcc

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

Lib/unittest/test/test_discovery.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,9 @@ def _get_module_from_name(name):
528528
pickle.loads(pickle.dumps(test, proto))
529529

530530
def test_discover_with_module_that_raises_SkipTest_on_import(self):
531+
if not unittest.BaseTestSuite._cleanup:
532+
raise unittest.SkipTest("Suite cleanup is disabled")
533+
531534
loader = unittest.TestLoader()
532535

533536
def _get_module_from_name(name):
@@ -548,6 +551,9 @@ def _get_module_from_name(name):
548551
pickle.loads(pickle.dumps(suite, proto))
549552

550553
def test_discover_with_init_module_that_raises_SkipTest_on_import(self):
554+
if not unittest.BaseTestSuite._cleanup:
555+
raise unittest.SkipTest("Suite cleanup is disabled")
556+
551557
vfs = {abspath('/foo'): ['my_package'],
552558
abspath('/foo/my_package'): ['__init__.py', 'test_module.py']}
553559
self.setup_import_issue_package_tests(vfs)

0 commit comments

Comments
 (0)