Only run extensive subprocess tests if -usubprocess to regrtest is specified. Fixes...

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 4835e64068d3e594e925d0c1e2bd2a3827cb7095..20407f8bd3c23fa5b4cf9c3b3fa4be0c7dce831b 100755 (executable)
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -93,6 +93,8 @@ resources to test.  Currently only the following are defined:
                 in the standard library and test suite.  This takes
                 a long time.
 
+    subprocess  Run all tests for the subprocess module. 
+
 To enable all resources except one, use '-uall,-<resource>'.  For
 example, to run all the tests except for the bsddb tests, give the
 option '-uall,-bsddb'.
@@ -136,7 +138,7 @@ if sys.platform == 'darwin':
 from test import test_support
 
 RESOURCE_NAMES = ('audio', 'curses', 'largefile', 'network', 'bsddb',
-                  'decimal', 'compiler')
+                  'decimal', 'compiler', 'subprocess')
 
 
 def usage(code, msg=''):

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index e8415cdf80ac321ccb40b684da0f5b25c3306872..efee5b525d2cb48ef6f22d4b101bacff39a1e911 100644 (file)
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -382,9 +382,10 @@ class ProcessTestCase(unittest.TestCase):
 
     def test_no_leaking(self):
         # Make sure we leak no resources
-        max_handles = 1026 # too much for most UNIX systems
-        if mswindows:
-            max_handles = 65 # a full test is too slow on Windows
+        if test_support.is_resource_enabled("subprocess") and not mswindows:
+            max_handles = 1026 # too much for most UNIX systems
+        else:
+            max_handles = 65 
         for i in range(max_handles):
             p = subprocess.Popen([sys.executable, "-c",
                     "import sys;sys.stdout.write(sys.stdin.read())"],