summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2013-03-20 06:27:09 (GMT)
committerGregory P. Smith <greg@krypto.org>2013-03-20 06:27:09 (GMT)
commit016b9e38f7b5362df21526fce4c7e675de50bebf (patch)
tree2c8ebe025766cb6509a13605a4ec8b567ab91471 /Lib
parenteddb0a7884e7b9edaeed8c5f6b250c40ece403ad (diff)
parent91110f5e5523b578cb74bf81473eb858f86e5338 (diff)
downloadcpython-016b9e38f7b5362df21526fce4c7e675de50bebf.zip
cpython-016b9e38f7b5362df21526fce4c7e675de50bebf.tar.gz
cpython-016b9e38f7b5362df21526fce4c7e675de50bebf.tar.bz2
Use a larger amount of data for tests such as the interrupted_write
tests that depend on filling up an OS pipe so that they work properly on systems configured with large pipe buffers. Also a subprocess docstring update that i forgot was in my client when i did the original 3.3 commit... easier to just leave that in here with this one than go back and undo/redo.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/subprocess.py7
-rw-r--r--Lib/test/support.py6
2 files changed, 8 insertions, 5 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index c66bd63..20f359a 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -166,7 +166,7 @@ getoutput(cmd):
'/bin/ls'
check_output(*popenargs, **kwargs):
- Run command with arguments and return its output as a byte string.
+ Run command with arguments and return its output.
If the exit code was non-zero it raises a CalledProcessError. The
CalledProcessError object will have the return code in the returncode
@@ -545,7 +545,7 @@ def check_call(*popenargs, **kwargs):
def check_output(*popenargs, timeout=None, **kwargs):
- r"""Run command with arguments and return its output as a byte string.
+ r"""Run command with arguments and return its output.
If the exit code was non-zero it raises a CalledProcessError. The
CalledProcessError object will have the return code in the returncode
@@ -563,6 +563,9 @@ def check_output(*popenargs, timeout=None, **kwargs):
... "ls -l non_existent_file ; exit 0"],
... stderr=STDOUT)
b'ls: non_existent_file: No such file or directory\n'
+
+ If universal_newlines=True is passed, the return value will be a
+ string rather than bytes.
"""
if 'stdout' in kwargs:
raise ValueError('stdout argument not allowed, it will be overridden.')
diff --git a/Lib/test/support.py b/Lib/test/support.py
index e6724a8..d089767 100644
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -576,9 +576,9 @@ IPV6_ENABLED = _is_ipv6_enabled()
# A constant likely larger than the underlying OS pipe buffer size.
-# Windows limit seems to be around 512B, and most Unix kernels have a 64K pipe
-# buffer size: take 1M to be sure.
-PIPE_MAX_SIZE = 1024 * 1024
+# Windows limit seems to be around 512B, and many Unix kernels have a 64K pipe
+# buffer size or 16*PAGE_SIZE: take a few megs to be sure. This
+PIPE_MAX_SIZE = 3 * 1000 * 1000
# decorator for skipping tests on non-IEEE 754 platforms