summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorPeter Astrand <astrand@lysator.liu.se>2005-03-03 20:47:37 (GMT)
committerPeter Astrand <astrand@lysator.liu.se>2005-03-03 20:47:37 (GMT)
commitf7f1bb7ff5039626c856efafb68a4d338ab96642 (patch)
treeae29d54bdddb9a00d5193ee3ae703d0992af1eff /Lib
parent23109f0009b34af04350417b17efc8190879ea78 (diff)
downloadcpython-f7f1bb7ff5039626c856efafb68a4d338ab96642.zip
cpython-f7f1bb7ff5039626c856efafb68a4d338ab96642.tar.gz
cpython-f7f1bb7ff5039626c856efafb68a4d338ab96642.tar.bz2
Only run extensive subprocess tests if -usubprocess to regrtest is specified. Fixes #1124637
Diffstat (limited to 'Lib')
-rwxr-xr-xLib/test/regrtest.py4
-rw-r--r--Lib/test/test_subprocess.py7
2 files changed, 7 insertions, 4 deletions
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 @@ 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 e8415cd..efee5b5 100644
--- 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())"],