Skip to content

bpo-33718: regrtest keeps filters to re-run fails #7291

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
vstinner merged 1 commit into from
May 31, 2018
+22 −17
Merged

bpo-33718: regrtest keeps filters to re-run fails #7291

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
39 changes: 22 additions & 17 deletions Lib/test/libregrtest/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,6 @@ def rerun_failed_tests(self):
self.ns.verbose = True
self.ns.failfast = False
self.ns.verbose3 = False
self.ns.match_tests = None

print()
print("Re-running failed tests in verbose mode")
Expand Down Expand Up @@ -313,7 +312,7 @@ def display_result(self):
return

print()
print("== Tests result ==")
print("== Tests result: %s ==" % self.get_tests_result())

if self.interrupted:
print()
Expand All @@ -324,11 +323,6 @@ def display_result(self):
print(count(len(omitted), "test"), "omitted:")
printlist(omitted)

if self.rerun:
print()
print(count(len(self.rerun), "test"), "re-run tests:")
printlist(self.rerun)

if self.good and not self.ns.quiet:
print()
if (not self.bad
Expand Down Expand Up @@ -361,6 +355,11 @@ def display_result(self):
print(count(len(self.skipped), "test"), "skipped:")
printlist(self.skipped)

if self.rerun:
print()
print("%s:" % count(len(self.rerun), "re-run test"))
printlist(self.rerun)

def run_tests_sequential(self):
if self.ns.trace:
import trace
Expand Down Expand Up @@ -445,6 +444,21 @@ def display_header(self):
% (locale.getpreferredencoding(False),
sys.getfilesystemencoding()))

def get_tests_result(self):
result = []
if self.bad:
result.append("FAILURE")
elif self.ns.fail_env_changed and self.environment_changed:
result.append("ENV CHANGED")

if self.interrupted:
result.append("INTERRUPTED")

if not result:
result.append("SUCCESS")

return ', '.join(result)

def run_tests(self):
# For a partial run, we do not need to clutter the output.
if (self.ns.header
Expand Down Expand Up @@ -486,16 +500,7 @@ def finalize(self):
print()
duration = time.monotonic() - self.start_time
print("Total duration: %s" % format_duration(duration))

if self.bad:
result = "FAILURE"
elif self.interrupted:
result = "INTERRUPTED"
elif self.ns.fail_env_changed and self.environment_changed:
result = "ENV CHANGED"
else:
result = "SUCCESS"
print("Tests result: %s" % result)
print("Tests result: %s" % self.get_tests_result())

if self.ns.runleaks:
os.system("leaks %d" % os.getpid())
Expand Down