djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/run-multitests.py: Don't allow imports from the cwd. 

Make tests run in an isolated environment (i.e. `import io` would
otherwise get the `tests/io` directory).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
This commit is contained in:
Jim Mussared 2023-06-02 15:23:23 +10:00
parent 4216bc7d13
commit 109717457e
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/run-multitests.py
View File

@ -162,6 +162,14 @@ class PyInstanceSubProcess(PyInstance):
def __str__(self): def __str__(self):
return self.argv[0].rsplit("/")[-1] return self.argv[0].rsplit("/")[-1]
def prepare_script_from_file(self, filename, prepend, append):
# Make tests run in an isolated environment (i.e. `import io` would
# otherwise get the `tests/io` directory).
remove_cwd_from_sys_path = b"import sys\nsys.path.remove('')\n\n"
return remove_cwd_from_sys_path + super().prepare_script_from_file(
filename, prepend, append
)
def run_script(self, script): def run_script(self, script):
output = b"" output = b""
err = None err = None
@ -582,7 +590,7 @@ def main():
cmd_args = cmd_parser.parse_args() cmd_args = cmd_parser.parse_args()
# clear search path to make sure tests use only builtin modules and those in extmod # clear search path to make sure tests use only builtin modules and those in extmod
os.environ["MICROPYPATH"] = os.pathsep.join(("", ".frozen", "../extmod")) os.environ["MICROPYPATH"] = os.pathsep.join((".frozen", "../extmod"))
test_files = prepare_test_file_list(cmd_args.files) test_files = prepare_test_file_list(cmd_args.files)
max_instances = max(t[1] for t in test_files) max_instances = max(t[1] for t in test_files)