From 95f2e95bc6525b33a5d7458bd3bb6234aa1a4068 Mon Sep 17 00:00:00 2001 From: AlexWaygood Date: Fri, 15 Sep 2023 15:46:07 +0100 Subject: [PATCH 1/2] gh-109413: Fix some trivial mypy nitpicks in libregrtest --- Lib/test/libregrtest/logger.py | 4 ++-- Lib/test/libregrtest/results.py | 6 ++---- Lib/test/libregrtest/single.py | 8 ++++---- Lib/test/libregrtest/worker.py | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Lib/test/libregrtest/logger.py b/Lib/test/libregrtest/logger.py index c397b21be84385..2ab8ebc8033da8 100644 --- a/Lib/test/libregrtest/logger.py +++ b/Lib/test/libregrtest/logger.py @@ -32,9 +32,9 @@ def log(self, line: str = '') -> None: mins, secs = divmod(int(test_time), 60) hours, mins = divmod(mins, 60) - test_time = "%d:%02d:%02d" % (hours, mins, secs) + formatted_test_time = "%d:%02d:%02d" % (hours, mins, secs) - line = f"{test_time} {line}" + line = f"{formatted_test_time} {line}" if empty: line = line[:-1] diff --git a/Lib/test/libregrtest/results.py b/Lib/test/libregrtest/results.py index f16b3373fd2afb..6e7d65880f7347 100644 --- a/Lib/test/libregrtest/results.py +++ b/Lib/test/libregrtest/results.py @@ -231,8 +231,7 @@ def display_summary(self, first_runtests: RunTests, filtered: bool): report.append(f'failures={stats.failures:,}') if stats.skipped: report.append(f'skipped={stats.skipped:,}') - report = ' '.join(report) - print(f"Total tests: {report}") + print(f"Total tests: {' '.join(report)}") # Total test files all_tests = [self.good, self.bad, self.rerun, @@ -256,5 +255,4 @@ def display_summary(self, first_runtests: RunTests, filtered: bool): ): if tests: report.append(f'{name}={len(tests)}') - report = ' '.join(report) - print(f"Total test files: {report}") + print(f"Total test files: {' '.join(report)}") diff --git a/Lib/test/libregrtest/single.py b/Lib/test/libregrtest/single.py index bc6021acb34aad..0304f858edf42c 100644 --- a/Lib/test/libregrtest/single.py +++ b/Lib/test/libregrtest/single.py @@ -136,14 +136,14 @@ def _runtest_env_changed_exc(result: TestResult, runtests: RunTests, with saved_test_environment(test_name, runtests.verbose, quiet, pgo=pgo): _load_run_test(result, runtests) - except support.ResourceDenied as msg: + except support.ResourceDenied as exc: if not quiet and not pgo: - print(f"{test_name} skipped -- {msg}", flush=True) + print(f"{test_name} skipped -- {exc}", flush=True) result.state = State.RESOURCE_DENIED return - except unittest.SkipTest as msg: + except unittest.SkipTest as exc: if not quiet and not pgo: - print(f"{test_name} skipped -- {msg}", flush=True) + print(f"{test_name} skipped -- {exc}", flush=True) result.state = State.SKIPPED return except support.TestFailedWithDetails as exc: diff --git a/Lib/test/libregrtest/worker.py b/Lib/test/libregrtest/worker.py index b93670c1c28e8e..610e0a8437839d 100644 --- a/Lib/test/libregrtest/worker.py +++ b/Lib/test/libregrtest/worker.py @@ -25,7 +25,7 @@ def create_worker_process(runtests: RunTests, output_fd: int, if python_cmd is not None: executable = python_cmd else: - executable = [sys.executable] + executable = (sys.executable,) cmd = [*executable, *support.args_from_interpreter_flags(), '-u', # Unbuffered stdout and stderr '-m', 'test.libregrtest.worker', From 24ec358fff72f65b8df32093201ad8ebf7ec83da Mon Sep 17 00:00:00 2001 From: AlexWaygood Date: Fri, 15 Sep 2023 17:32:52 +0100 Subject: [PATCH 2/2] `test_time` -> `log_time` --- Lib/test/libregrtest/logger.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/test/libregrtest/logger.py b/Lib/test/libregrtest/logger.py index 2ab8ebc8033da8..2f0c4bf1c84b5c 100644 --- a/Lib/test/libregrtest/logger.py +++ b/Lib/test/libregrtest/logger.py @@ -28,13 +28,13 @@ def log(self, line: str = '') -> None: line = f"load avg: {load_avg:.2f} {line}" # add the timestamp prefix: "0:01:05 " - test_time = time.perf_counter() - self.start_time + log_time = time.perf_counter() - self.start_time - mins, secs = divmod(int(test_time), 60) + mins, secs = divmod(int(log_time), 60) hours, mins = divmod(mins, 60) - formatted_test_time = "%d:%02d:%02d" % (hours, mins, secs) + formatted_log_time = "%d:%02d:%02d" % (hours, mins, secs) - line = f"{formatted_test_time} {line}" + line = f"{formatted_log_time} {line}" if empty: line = line[:-1]