Only run extensive subprocess tests if -usubprocess to regrtest is specified. Fixes #1124637
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 4835e64..20407f8 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -93,6 +93,8 @@
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 @@
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 e8415cd..efee5b5 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -382,9 +382,10 @@
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())"],