mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-29 11:45:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

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

Browse source 
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 e4f9a2d2be)
This commit is contained in:
Victor Stinner 2017-06-30 13:12:20 +02:00 • committed by GitHub
parent d0aac5da59
commit 22d4e8fb99
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/unittest/test/test_discovery.py
View file

@ -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):
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)