summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2011-03-14 18:14:42 (GMT)
committerGregory P. Smith <greg@krypto.org>2011-03-14 18:14:42 (GMT)
commit5865facfb62a906a93d3245f0fb384cd4aceeb91 (patch)
tree56e09f60f1facecb9875c6cd091784a3e218ec9f /Lib
parent54d412edcc940560a47a581981d0010f9c3504cb (diff)
parent80b92d106e8165afcbcf8246a08b9e7a117e73e7 (diff)
downloadcpython-5865facfb62a906a93d3245f0fb384cd4aceeb91.zip
cpython-5865facfb62a906a93d3245f0fb384cd4aceeb91.tar.gz
cpython-5865facfb62a906a93d3245f0fb384cd4aceeb91.tar.bz2
merge default
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_subprocess.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index b64a044..782d9f1 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -128,7 +128,7 @@ class ProcessTestCase(BaseTestCase):
"import sys; sys.stdout.write('BDFL')\n"
"sys.stdout.flush()\n"
"while True: pass"],
- timeout=0.5)
+ timeout=1.5)
self.fail("Expected TimeoutExpired.")
self.assertEqual(c.exception.output, b'BDFL')