https://github.com/python/cpython/commit/8ce48c8ebc115d80da82b865c5faccd1cf2f3baf commit: 8ce48c8ebc115d80da82b865c5faccd1cf2f3baf branch: 3.13 author: Miss Islington (bot) <[email protected]> committer: vstinner <[email protected]> date: 2025-02-21T14:18:32Z summary:
[3.13] gh-129363: Change regrtest sequential mode output (GH-129476) (#130405) gh-129363: Change regrtest sequential mode output (GH-129476) First, write the test name without color. Then, write the test name and the result with color. Each test is displayed twice. (cherry picked from commit f1b81c408fb83beeee519ae4fb9d3a36dd4522b3) Co-authored-by: Victor Stinner <[email protected]> Co-authored-by: Hugo van Kemenade <[email protected]> files: M Lib/test/libregrtest/main.py M Lib/test/test_regrtest.py diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py index da63079399a372..36e8d5ad6b2458 100644 --- a/Lib/test/libregrtest/main.py +++ b/Lib/test/libregrtest/main.py @@ -387,15 +387,11 @@ def run_tests_sequentially(self, runtests: RunTests) -> None: msg += " (timeout: %s)" % format_duration(runtests.timeout) self.log(msg) - previous_test = None tests_iter = runtests.iter_tests() for test_index, test_name in enumerate(tests_iter, 1): start_time = time.perf_counter() - text = test_name - if previous_test: - text = '%s -- %s' % (text, previous_test) - self.logger.display_progress(test_index, text) + self.logger.display_progress(test_index, test_name) result = self.run_test(test_name, runtests, tracer) @@ -412,19 +408,14 @@ def run_tests_sequentially(self, runtests: RunTests) -> None: except (KeyError, AttributeError): pass - if result.must_stop(self.fail_fast, self.fail_env_changed): - break - - previous_test = str(result) + text = str(result) test_time = time.perf_counter() - start_time if test_time >= PROGRESS_MIN_TIME: - previous_test = "%s in %s" % (previous_test, format_duration(test_time)) - elif result.state == State.PASSED: - # be quiet: say nothing if the test passed shortly - previous_test = None + text = f"{text} in {format_duration(test_time)}" + self.logger.display_progress(test_index, text) - if previous_test: - print(previous_test) + if result.must_stop(self.fail_fast, self.fail_env_changed): + break def get_state(self) -> str: state = self.results.get_state(self.fail_env_changed) diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py index a5c9617bb07fd6..599134cd96783f 100644 --- a/Lib/test/test_regrtest.py +++ b/Lib/test/test_regrtest.py @@ -39,6 +39,17 @@ ROOT_DIR = os.path.join(os.path.dirname(__file__), '..', '..') ROOT_DIR = os.path.abspath(os.path.normpath(ROOT_DIR)) LOG_PREFIX = r'[0-9]+:[0-9]+:[0-9]+ (?:load avg: [0-9]+\.[0-9]{2} )?' +RESULT_REGEX = ( + 'passed', + 'failed', + 'skipped', + 'interrupted', + 'env changed', + 'timed out', + 'ran no tests', + 'worker non-zero exit code', +) +RESULT_REGEX = fr'(?:{"|".join(RESULT_REGEX)})' EXITCODE_BAD_TEST = 2 EXITCODE_ENV_CHANGED = 3 @@ -552,8 +563,8 @@ def check_line(self, output, pattern, full=False, regex=True): self.assertRegex(output, regex) def parse_executed_tests(self, output): - regex = (r'^%s\[ *[0-9]+(?:/ *[0-9]+)*\] (%s)' - % (LOG_PREFIX, self.TESTNAME_REGEX)) + regex = (fr'^{LOG_PREFIX}\[ *[0-9]+(?:/ *[0-9]+)*\] ' + fr'({self.TESTNAME_REGEX}) {RESULT_REGEX}') parser = re.finditer(regex, output, re.MULTILINE) return list(match.group(1) for match in parser) _______________________________________________ Python-checkins mailing list -- [email protected] To unsubscribe send an email to [email protected] https://mail.python.org/mailman3/lists/python-checkins.python.org/ Member address: [email protected]
