Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-129363: Change regrtest sequential mode output #129476

Merged
merged 2 commits into from
Feb 21, 2025
Merged

gh-129363: Change regrtest sequential mode output #129476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4f338d
gh-129363: Change regrtest sequential mode output
vstinner Jan 30, 2025
604a6ea
Merge branch 'main' into regrtest_sequential
hugovk Feb 20, 2025
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
21 changes: 6 additions & 15 deletions Lib/test/libregrtest/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,15 +399,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)

Expand All @@ -424,19 +420,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)
Expand Down
15 changes: 13 additions & 2 deletions Lib/test/test_regrtest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,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
Expand Down Expand Up @@ -555,8 +566,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)

Expand Down
Loading