From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 5 Aug 2015 02:53:21 +0000 (-0500)
Subject: Issue #24751: When running regrtest with '-w', don't fail if re-run succeeds.
X-Git-Tag: v2.7.11rc1~201
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4777f1befa51c4f9c192c7390294e67667a8190;p=thirdparty%2FPython%2Fcpython.git

Issue #24751: When running regrtest with '-w', don't fail if re-run succeeds.
---

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 2458a3d1a0cb..eaf39bb8a674 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -652,7 +652,7 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
 
     if 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:
@@ -662,8 +662,13 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
                 # print a newline separate from the ^C
                 print
                 break
-            except:
-                raise
+            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 single:
         if next_single_test:
diff --git a/Misc/NEWS b/Misc/NEWS
index 09db1d3ec5b8..76e02269777b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -149,6 +149,13 @@ Documentation
 - Issue #22155: Add File Handlers subsection with createfilehandler to Tkinter
   doc.  Remove obsolete example from FAQ.  Patch by Martin Panter.
 
+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 2.7.10?
 ============================