traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

simplify cleanup of test_replace_parent_in_sys_modules (closes #28862)

This commit is contained in:
Benjamin Peterson 2016-12-03 23:17:04 -08:00
parent 2df5adb92e
commit 1426a99d31
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Lib/test/test_import.py
View File

@ -400,20 +400,19 @@ class ImportTests(unittest.TestCase):
def test_replace_parent_in_sys_modules(self):
dir_name = os.path.abspath(TESTFN)
os.mkdir(dir_name)
try:
pkg_dir = os.path.join(dir_name, 'sa')
os.mkdir(pkg_dir)
with open(os.path.join(pkg_dir, '__init__.py'), 'w') as init_file:
init_file.write("import v1")
with open(os.path.join(pkg_dir, 'v1.py'), 'w') as v1_file:
v1_file.write("import sys;"
"sys.modules['sa'] = sys.modules[__name__];"
"import sa")
sys.path.insert(0, dir_name)
# a segfault means the test failed!
import sa
finally:
rmtree(dir_name)
self.addCleanup(rmtree, dir_name)
pkg_dir = os.path.join(dir_name, 'sa')
os.mkdir(pkg_dir)
with open(os.path.join(pkg_dir, '__init__.py'), 'w') as init_file:
init_file.write("import v1")
with open(os.path.join(pkg_dir, 'v1.py'), 'w') as v1_file:
v1_file.write("import sys;"
"sys.modules['sa'] = sys.modules[__name__];"
"import sa")
sys.path.insert(0, dir_name)
self.addCleanup(sys.path.pop, 0)
# a segfault means the test failed!
import sa
def test_fromlist_type(self):
with self.assertRaises(TypeError) as cm: