[Python-checkins] r76856 - in python/trunk: Lib/test/regrtest.py Misc/NEWS

[r.david.murray]

Author: r.david.murray
Date: Wed Dec 16 12:49:46 2009
New Revision: 76856

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


Modified:
   python/trunk/Lib/test/regrtest.py
   python/trunk/Misc/NEWS

Modified: python/trunk/Lib/test/regrtest.py
==============================================================================
--- python/trunk/Lib/test/regrtest.py	(original)
+++ python/trunk/Lib/test/regrtest.py	Wed Dec 16 12:49:46 2009
@@ -406,9 +406,14 @@
                 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 @@
                 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)
 

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Wed Dec 16 12:49:46 2009
@@ -46,6 +46,8 @@
 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.