Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions Lib/test/libregrtest/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -466,12 +466,6 @@ def get_temp_dir(tmp_dir: StrPath | None = None) -> StrPath:
f"unexpectedly returned {tmp_dir!r} on WASI"
)
tmp_dir = os.path.join(tmp_dir, 'build')

# When get_temp_dir() is called in a worker process,
# get_temp_dir() path is different than in the parent process
# which is not a WASI process. So the parent does not create
# the same "tmp_dir" than the test worker process.
os.makedirs(tmp_dir, exist_ok=True)
else:
tmp_dir = tempfile.gettempdir()

Expand Down
3 changes: 3 additions & 0 deletions Lib/test/libregrtest/worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ def main() -> NoReturn:
worker_json = sys.argv[1]

tmp_dir = get_temp_dir()
# get_temp_dir() can be different in the worker and the parent process.
# For example, if --tempdir option is used.
os.makedirs(tmp_dir, exist_ok=True)
work_dir = get_work_dir(tmp_dir, worker=True)

with exit_timeout():
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix a race condition in regrtest: make sure that the temporary directory is
created in the worker process. Previously, temp_cwd() could fail on Windows if
the "build" directory was not created. Patch by Victor Stinner.
Loading