Issue #24751: Merge with 3.4

This commit is contained in:
Zachary Ware 2015-08-04 21:58:00 -05:00
commit 40648838b2
2 changed files with 15 additions and 1 deletions

View file

@ -810,7 +810,7 @@ def main(tests=None, **kwargs):
if ns.verbose2 and bad:
print("Re-running failed tests in verbose mode")
for test in bad:
for test in bad[:]:
print("Re-running test %r in verbose mode" % test)
sys.stdout.flush()
try:
@ -821,6 +821,13 @@ def main(tests=None, **kwargs):
# print a newline separate from the ^C
print()
break
else:
if ok[0] in {PASSED, ENV_CHANGED, SKIPPED, RESOURCE_DENIED}:
bad.remove(test)
else:
if bad:
print(count(len(bad), 'test'), "failed again:")
printlist(bad)
if ns.single:
if next_single_test: