Skip to content

bpo-44708: Only re-run test methods that match names of previously failing test methods #27287

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 11 commits into from
Jul 22, 2021
Merged

bpo-44708: Only re-run test methods that match names of previously failing test methods #27287

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
db6e311
Move to a static namespace
ambv Jul 21, 2021
59d83c1
Roughly annotate runtest.py
ambv Jul 21, 2021
89b209e
Refactor libregrtest to use lossless test result objects
ambv Jul 21, 2021
c049888
Only re-run test methods that match names of previously failing test …
ambv Jul 21, 2021
d55e65b
Support multiprocessing test runners, too
ambv Jul 22, 2021
aad108f
Don't accumulate matches when multiple test files re-run
ambv Jul 22, 2021
67c3e3d
Adopt tests to cover test method name matching
ambv Jul 22, 2021
26f3ba3
Add Blurb
ambv Jul 22, 2021
fb4346a
Change check order for Skipped and ResourceDenied (which subclasses S…
ambv Jul 22, 2021
d9d7e0e
Run `make patchcheck` to normalize whitespace
ambv Jul 22, 2021
3e4622b
Explicitly name list comprehension variable for clarity
ambv Jul 22, 2021
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
23 changes: 19 additions & 4 deletions Lib/test/libregrtest/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ def accumulate_result(self, result, rerun=False):
elif isinstance(result, Failed):
if not rerun:
self.bad.append(test_name)
self.rerun.append(result)
elif isinstance(result, DidNotRun):
self.run_no_tests.append(test_name)
elif isinstance(result, Interrupted):
Expand Down Expand Up @@ -311,10 +312,24 @@ def rerun_failed_tests(self):

self.log()
self.log("Re-running failed tests in verbose mode")
self.rerun = self.bad[:]
for test_name in self.rerun:
self.log(f"Re-running {test_name} in verbose mode")
rerun_list = self.rerun[:]
self.rerun = []
for result in rerun_list:
test_name = result.name
errors = result.errors or []
failures = result.failures or []
error_names = [e[0].split(" ")[0] for e in errors]
failure_names = [f[0].split(" ")[0] for f in failures]
self.ns.verbose = True
if errors or failures:
if self.ns.match_tests is None:
self.ns.match_tests = []
self.ns.match_tests.extend(error_names)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question: Do we want to rerun errors? In theory those are things like failures to set up the test and similar. Do you think that this is something we should run again?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only case where we gather errors is with TestFailedWithDetails which means those are unittest failures and/or errors. We've been re-running the entire file in this scenario before. I think we should still as some of those are exceptions raised due to race conditions. We might think of tightening this up in a future update.

self.ns.match_tests.extend(failure_names)
Comment on lines +328 to +329
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the money shot.

matching = "matching: " + ", ".join(self.ns.match_tests)
self.log(f"Re-running {test_name} in verbose mode ({matching})")
else:
self.log(f"Re-running {test_name} in verbose mode")
result = runtest(self.ns, test_name)

self.accumulate_result(result, rerun=True)
Expand Down Expand Up @@ -380,7 +395,7 @@ def display_result(self):
if self.rerun:
print()
print("%s:" % count(len(self.rerun), "re-run test"))
printlist(self.rerun)
printlist(r.name for r in self.rerun)

if self.run_no_tests:
print()
Expand Down
4 changes: 3 additions & 1 deletion Lib/test/support/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,7 +991,9 @@ def _run_suite(suite):
else:
err = "multiple errors occurred"
if not verbose: err += "; run in verbose mode for details"
raise TestFailedWithDetails(err, result.errors, result.failures)
errors = [(str(tc), exc_str) for tc, exc_str in result.errors]
failures = [(str(tc), exc_str) for tc, exc_str in result.failures]
raise TestFailedWithDetails(err, errors, failures)


# By default, don't filter tests
Expand Down