Skip to content

gh-109276: Enhance libregrtest results #109828

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

Merged
merged 1 commit into from
Sep 25, 2023
Merged

gh-109276: Enhance libregrtest results #109828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
67 changes: 29 additions & 38 deletions Lib/test/libregrtest/results.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ def __init__(self):
# used by --junit-xml
self.testsuite_xml: list[str] = []

def is_all_good(self):
return (not self.bad
and not self.skipped
and not self.interrupted)

def get_executed(self):
return (set(self.good) | set(self.bad) | set(self.skipped)
| set(self.resource_denied) | set(self.env_changed)
Expand Down Expand Up @@ -164,61 +169,47 @@ def write_junit(self, filename: StrPath):
f.write(s)

def display_result(self, tests: TestTuple, quiet: bool, print_slowest: bool):
if self.interrupted:
print("Test suite interrupted by signal SIGINT.")

omitted = set(tests) - self.get_executed()
if omitted:
print()
print(count(len(omitted), "test"), "omitted:")
printlist(omitted)

if self.good and not quiet:
print()
if (not self.bad
and not self.skipped
and not self.interrupted
and len(self.good) > 1):
print("All", end=' ')
print(count(len(self.good), "test"), "OK.")

if print_slowest:
self.test_times.sort(reverse=True)
print()
print("10 slowest tests:")
for test_time, test in self.test_times[:10]:
print("- %s: %s" % (test, format_duration(test_time)))

if self.bad:
print()
print(count(len(self.bad), "test"), "failed:")
printlist(self.bad)

if self.env_changed:
print()
print("{} altered the execution environment:".format(
count(len(self.env_changed), "test")))
printlist(self.env_changed)

if self.skipped and not quiet:
print()
print(count(len(self.skipped), "test"), "skipped:")
printlist(self.skipped)

if self.resource_denied and not quiet:
print()
print(count(len(self.resource_denied), "test"), "skipped (resource denied):")
printlist(self.resource_denied)
all_tests = [
(self.bad, "test", "{} failed:"),
(self.env_changed, "test", "{} altered the execution environment (env changed):"),
]
if not quiet:
all_tests.append((self.skipped, "test", "{} skipped:"))
all_tests.append((self.resource_denied, "test", "{} skipped (resource denied):"))
all_tests.append((self.rerun, "re-run test", "{}:"))
all_tests.append((self.run_no_tests, "test", "{} run no tests:"))

for tests_list, count_text, title_format in all_tests:
if tests_list:
print()
count_text = count(len(tests_list), count_text)
print(title_format.format(count_text))
printlist(tests_list)

if self.rerun:
if self.good and not quiet:
print()
print("%s:" % count(len(self.rerun), "re-run test"))
printlist(self.rerun)
text = count(len(self.good), "test")
text = f"{text} OK."
if (self.is_all_good() and len(self.good) > 1):
text = f"All {text}"
print(text)

if self.run_no_tests:
if self.interrupted:
print()
print(count(len(self.run_no_tests), "test"), "run no tests:")
printlist(self.run_no_tests)
print("Test suite interrupted by signal SIGINT.")

def display_summary(self, first_runtests: RunTests, filtered: bool):
# Total tests
Expand Down
3 changes: 2 additions & 1 deletion Lib/test/test_regrtest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,8 @@ def list_regex(line_format, tests):
self.check_line(output, regex)

if env_changed:
regex = list_regex('%s test%s altered the execution environment',
regex = list_regex(r'%s test%s altered the execution environment '
r'\(env changed\)',
env_changed)
self.check_line(output, regex)

Expand Down