8000 gh-109276: libregrtest: fix worker working dir · python/cpython@fc37a3f · GitHub
[go: up one dir, main page]
Skip to content

Commit fc37a3f

Browse files
vstinnervstinner
committed
gh-109276: libregrtest: fix worker working dir
Fix Emscripten and WASI: start the test worker process in the Python source code directory, where 'python.js' and 'python.wasm' can be found. Then worker_process() changes to a temporary directory created to run tests. * create_worker_process() uses os_helper.SAVEDCWD as cwd. * worker_process() uses get_temp_dir() as the parent directory for get_work_dir(). * Don't use plural but singual for "test" in "Run 1 test ..." message. * Remove unused imports. * Add WORK_DIR_PREFIX and WORKER_WORK_DIR_PREFIX constants.
1 parent 8c813fa commit fc37a3f

File tree

4 files changed

+24
-16
lines changed

4 files changed

+24
-16
lines changed

‎Lib/test/libregrtest/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ def run_tests_sequentially(self, runtests):
297297

298298
jobs = runtests.get_jobs()
299299
if jobs is not None:
300-
tests = f'{jobs} tests'
300+
tests = count(jobs, 'test')
301301
else:
302302
tests = 'tests'
303303
msg = f"Run {tests} sequentially"
@@ -458,7 +458,7 @@ def _run_tests(self, selected: TestTuple, tests: TestList | None) -> int:
458458

459459
def run_tests(self, selected: TestTuple, tests: TestList | None) -> int:
460460
os.makedirs(self.tmp_dir, exist_ok=True)
461-
work_dir = get_work_dir(parent_dir=self.tmp_dir)
461+
work_dir = get_work_dir(self.tmp_dir)
462462

463463
# Put a timeout on Python exit
464464
with exit_timeout():

‎Lib/test/libregrtest/run_workers.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import threading
1010
import time
1111
import traceback
12-
from typing import Literal, TextIO
12+
from typing import Literal
1313

1414
from test import support
1515
from test.support import os_helper
@@ -21,7 +21,7 @@
2121
from .single import PROGRESS_MIN_TIME
2222
from .utils import (
2323
StrPath, StrJSON, TestName, MS_WINDOWS,
24-
format_duration, print_warning, plural)
24+
format_duration, print_warning, count, plural)
2525
from .worker import create_worker_process, USE_PROCESS_GROUP
2626

2727
if MS_WINDOWS:
@@ -280,7 +280,7 @@ def _runtest(self, test_name: TestName) -> MultiprocessResult:
280280
if worker_json:
281281
result = TestResult.from_json(worker_json)
282282
else:
283-
err_msg = f"empty JSON"
283+
err_msg = "empty JSON"
284284
except Exception as exc:
285285
# gh-101634: Catch UnicodeDecodeError if stdout cannot be
286286
# decoded from encoding
@@ -412,7 +412,7 @@ def start_workers(self) -> None:
412412
for index in range(1, self.num_workers + 1)]
413413
jobs = self.runtests.get_jobs()
414414
if jobs is not None:
415-
tests = f'{jobs} tests'
415+
tests = count(jobs, 'test')
416416
else:
417417
tests = 'tests'
418418
nworkers = len(self.workers)

‎Lib/test/libregrtest/utils.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818

1919
MS_WINDOWS = (sys.platform == 'win32')
20+
WORK_DIR_PREFIX = 'test_python_'
21+
WORKER_WORK_DIR_PREFIX = f'{WORK_DIR_PREFIX}worker_'
2022

2123
# bpo-38203: Maximum delay in seconds to exit Python (call Py_Finalize()).
2224
# Used to protect against threading._shutdown() hang.
@@ -346,7 +348,7 @@ def get_build_info():
346348
return build
347349

348350

349-
def get_temp_dir(tmp_dir):
351+
def get_temp_dir(tmp_dir: StrPath | None = None) -> StrPath:
350352
if tmp_dir:
351353
tmp_dir = os.path.expanduser(tmp_dir)
352354
else:
@@ -379,7 +381,7 @@ def fix_umask():
379381
os.umask(old_mask)
380382

381383

382-
def get_work_dir(*, parent_dir: StrPath = '', worker: bool = False):
384+
def get_work_dir(parent_dir: StrPath, worker: bool = False) -> StrPath:
383385
# Define a writable temp dir that will be used as cwd while running
384386
# the tests. The name of the dir includes the pid to allow parallel
385387
# testing (see the -j option).
@@ -391,12 +393,11 @@ def get_work_dir(*, parent_dir: StrPath = '', worker: bool = False):
391393
nounce = os.getpid()
392394

393395
if worker:
394-
work_dir = 'test_python_worker_{}'.format(nounce)
396+
work_dir = WORK_DIR_PREFIX + str(nounce)
395397
else:
396-
work_dir = 'test_python_{}'.format(nounce)
398+
work_dir = WORKER_WORK_DIR_PREFIX + str(nounce)
397399
work_dir += os_helper.FS_NONASCII
398-
if parent_dir:
399-
work_dir = os.path.join(parent_dir, work_dir)
400+
work_dir = os.path.join(parent_dir, work_dir)
400401
return work_dir
401402

402403

@@ -579,7 +580,7 @@ def display_header():
579580
def cleanup_temp_dir(tmp_dir: StrPath):
580581
import glob
581582

582-
path = os.path.join(glob.escape(tmp_dir), 'test_python_*')
583+
path = os.path.join(glob.escape(tmp_dir), WORK_DIR_PREFIX + '*')
583584
print("Cleanup %s directory" % tmp_dir)
584585
for name in glob.glob(path):
585586
if os.path.isdir(name):

‎Lib/test/libregrtest/worker.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import subprocess
22
import sys
33
import os
4-
from typing import TextIO, NoReturn
4+
from typing import NoReturn
55

66
from test import support
77
from test.support import os_helper
@@ -11,7 +11,7 @@
1111
from .single import run_single_test
1212
from .utils import (
1313
StrPath, StrJSON, FilterTuple, MS_WINDOWS,
14-
get_work_dir, exit_timeout)
14+
get_temp_dir, get_work_dir, exit_timeout)
1515

1616

1717
USE_PROCESS_GROUP = (hasattr(os, "setsid") and hasattr(os, "killpg"))
@@ -38,6 +38,11 @@ def create_worker_process(runtests: RunTests,
3838
env['TEMP'] = tmp_dir
3939
env['TMP'] = tmp_dir
4040

41+
# Emscripten and WASI Python must start in the Python source code directory
42+
# to get 'python.js' or 'python.wasm' file. Then worker_process() changes
43+
# to a temporary directory created to run tests.
44+
work_dir = os_helper.SAVEDCWD
45+
4146
# Running the child from the same working directory as regrtest's original
4247
# invocation ensures that TEMPDIR for the child is the same when
4348
# sysconfig.is_python_build() is true. See issue 15300.
@@ -48,6 +53,7 @@ def create_worker_process(runtests: RunTests,
4853
stderr=output_fd,
4954
text=True,
5055
close_fds=True,
56+
cwd=work_dir,
5157
)
5258
if not MS_WINDOWS:
5359
kwargs['pass_fds'] = [json_fd]
@@ -102,7 +108,8 @@ def main():
102108
sys.exit(1)
103109
worker_json = sys.argv[1]
104110

105-
work_dir = get_work_dir(worker=True)
111+
tmp_dir = get_temp_dir()
112+
work_dir = get_work_dir(tmp_dir, worker=True)
106113

107114
with exit_timeout():
108115
with os_helper.temp_cwd(work_dir, quiet=True):

0 commit comments

Comments
 (0)
0