From: R. David Murray <rdmurray@bitdance.com>
Date: Wed, 16 Dec 2009 11:49:46 +0000 (+0000)
Subject: Issue #7396: fix -s, which was broken by the -j enhancement.
X-Git-Tag: v2.7a2~164
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=98e3df38fd863af8f399739e461f84058e7bcfe0;p=thirdparty%2FPython%2Fcpython.git

Issue #7396: fix -s, which was broken by the -j enhancement.
---

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index d0ea5e2f29bf..fd6cafce7ecc 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -406,9 +406,14 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
                 stdtests.remove(arg)
         nottests[:0] = args
         args = []
-    tests = tests or args or findtests(testdir, stdtests, nottests)
+    alltests = findtests(testdir, stdtests, nottests)
+    tests = tests or args or alltests
     if single:
         tests = tests[:1]
+        try:
+            next_single_test = alltests[alltests.index(tests[0])+1]
+        except IndexError:
+            next_single_test = None
     if randomize:
         random.seed(random_seed)
         print "Using random seed", random_seed
@@ -613,16 +618,9 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
                 raise
 
     if single:
-        alltests = findtests(testdir, stdtests, nottests)
-        for i in range(len(alltests)):
-            if tests[0] == alltests[i]:
-                if i == len(alltests) - 1:
-                    os.unlink(filename)
-                else:
-                    fp = open(filename, 'w')
-                    fp.write(alltests[i+1] + '\n')
-                    fp.close()
-                break
+        if next_single_test:
+            with open(filename, 'w') as fp:
+                fp.write(next_single_test + '\n')
         else:
             os.unlink(filename)
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 53905e4fa3df..c660e81e29ef 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -46,6 +46,8 @@ Library
 Tests
 -----
 
+- Issue #7396: fix regrtest -s, which was broken by the -j enhancement.
+
 - Issue #7498: test_multiprocessing now uses test_support.find_unused_port
   instead of a hardcoded port number in test_rapid_restart.