Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-93616: Fix env changed issue in test_modulefinder (GH-93617) 

(cherry picked from commit cffa4f7854)

Co-authored-by: Christian Heimes <christian@python.org>
This commit is contained in:
Miss Islington (bot) 2022-06-09 00:02:39 -07:00 committed by GitHub
parent 47a7855f41
commit 98bbbbe46d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
Lib/test/test_modulefinder.py
View File

@ -10,9 +10,6 @@ from test import support
import modulefinder import modulefinder
TEST_DIR = tempfile.mkdtemp()
TEST_PATH = [TEST_DIR, os.path.dirname(tempfile.__file__)]
# Each test description is a list of 5 items: # Each test description is a list of 5 items:
# #
# 1. a module name that will be imported by modulefinder # 1. a module name that will be imported by modulefinder
@ -23,9 +20,9 @@ TEST_PATH = [TEST_DIR, os.path.dirname(tempfile.__file__)]
# about because they MAY be not found # about because they MAY be not found
# 5. a string specifying packages to create; the format is obvious imo. # 5. a string specifying packages to create; the format is obvious imo.
# #
# Each package will be created in TEST_DIR, and TEST_DIR will be # Each package will be created in test_dir, and test_dir will be
# removed after the tests again. # removed after the tests again.
# Modulefinder searches in a path that contains TEST_DIR, plus # Modulefinder searches in a path that contains test_dir, plus
# the standard Lib directory. # the standard Lib directory.
maybe_test = [ maybe_test = [
@ -300,7 +297,7 @@ def open_file(path):
return open(path, 'wb') return open(path, 'wb')
def create_package(source): def create_package(test_dir, source):
ofi = None ofi = None
try: try:
for line in source.splitlines(): for line in source.splitlines():
@ -313,41 +310,45 @@ def create_package(source):
ofi.close() ofi.close()
if type(line) == bytes: if type(line) == bytes:
line = line.decode('utf-8') line = line.decode('utf-8')
ofi = open_file(os.path.join(TEST_DIR, line.strip())) ofi = open_file(os.path.join(test_dir, line.strip()))
finally: finally:
if ofi: if ofi:
ofi.close() ofi.close()
class ModuleFinderTest(unittest.TestCase): class ModuleFinderTest(unittest.TestCase):
def setUp(self):
self.test_dir = tempfile.mkdtemp()
self.test_path = [self.test_dir, os.path.dirname(tempfile.__file__)]
def tearDown(self):
shutil.rmtree(self.test_dir)
def _do_test(self, info, report=False, debug=0, replace_paths=[], modulefinder_class=modulefinder.ModuleFinder): def _do_test(self, info, report=False, debug=0, replace_paths=[], modulefinder_class=modulefinder.ModuleFinder):
import_this, modules, missing, maybe_missing, source = info import_this, modules, missing, maybe_missing, source = info
create_package(source) create_package(self.test_dir, source)
try: mf = modulefinder_class(path=self.test_path, debug=debug,
mf = modulefinder_class(path=TEST_PATH, debug=debug, replace_paths=replace_paths)
replace_paths=replace_paths) mf.import_hook(import_this)
mf.import_hook(import_this) if report:
if report: mf.report()
mf.report() ## # This wouldn't work in general when executed several times:
## # This wouldn't work in general when executed several times: ## opath = sys.path[:]
## opath = sys.path[:] ## sys.path = self.test_path
## sys.path = TEST_PATH ## try:
## try: ## __import__(import_this)
## __import__(import_this) ## except:
## except: ## import traceback; traceback.print_exc()
## import traceback; traceback.print_exc() ## sys.path = opath
## sys.path = opath ## return
## return modules = sorted(set(modules))
modules = sorted(set(modules)) found = sorted(mf.modules)
found = sorted(mf.modules) # check if we found what we expected, not more, not less
# check if we found what we expected, not more, not less self.assertEqual(found, modules)
self.assertEqual(found, modules)
# check for missing and maybe missing modules # check for missing and maybe missing modules
bad, maybe = mf.any_missing_maybe() bad, maybe = mf.any_missing_maybe()
self.assertEqual(bad, missing) self.assertEqual(bad, missing)
self.assertEqual(maybe, maybe_missing) self.assertEqual(maybe, maybe_missing)
finally:
shutil.rmtree(TEST_DIR)
def test_package(self): def test_package(self):
self._do_test(package_test) self._do_test(package_test)
@ -380,7 +381,7 @@ class ModuleFinderTest(unittest.TestCase):
self._do_test(same_name_as_bad_test) self._do_test(same_name_as_bad_test)
def test_bytecode(self): def test_bytecode(self):
base_path = os.path.join(TEST_DIR, 'a') base_path = os.path.join(self.test_dir, 'a')
source_path = base_path + importlib.machinery.SOURCE_SUFFIXES[0] source_path = base_path + importlib.machinery.SOURCE_SUFFIXES[0]
bytecode_path = base_path + importlib.machinery.BYTECODE_SUFFIXES[0] bytecode_path = base_path + importlib.machinery.BYTECODE_SUFFIXES[0]
with open_file(source_path) as file: with open_file(source_path) as file:
@ -390,8 +391,8 @@ class ModuleFinderTest(unittest.TestCase):
self._do_test(bytecode_test) self._do_test(bytecode_test)
def test_replace_paths(self): def test_replace_paths(self):
old_path = os.path.join(TEST_DIR, 'a', 'module.py') old_path = os.path.join(self.test_dir, 'a', 'module.py')
new_path = os.path.join(TEST_DIR, 'a', 'spam.py') new_path = os.path.join(self.test_dir, 'a', 'spam.py')
with support.captured_stdout() as output: with support.captured_stdout() as output:
self._do_test(maybe_test, debug=2, self._do_test(maybe_test, debug=2,
replace_paths=[(old_path, new_path)]) replace_paths=[(old_path, new_path)])

2
Misc/NEWS.d/next/Tests/2022-06-08-22-32-56.gh-issue-93616.e5Kkx2.rst Normal file
View File

@ -0,0 +1,2 @@
``test_modulefinder`` now creates a temporary directory in
``ModuleFinderTest.setUp()`` instead of module scope.