Closes #24751: Merge with 3.5

2 files changed, 15 insertions, 1 deletions

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 5b1fcc6..5650be0 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -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:
diff --git a/Misc/NEWS b/Misc/NEWS
index ac7b2df..0d86568 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -71,6 +71,13 @@ Documentation
 - Issue #24729: Correct IO tutorial to match implementation regarding
   encoding parameter to open function.
 
+Tests
+-----
+
+- Issue #24751: When running regrtest with the ``-w`` command line option,
+  a test run is no longer marked as a failure if all tests succeed when
+  re-run.
+
 
 What's New in Python 3.5.0 beta 4?
 ==================================