[Python-checkins] cpython (merge default -> default): merge default

[gregory.p.smith]

http://hg.python.org/cpython/rev/825683d32fd6
changeset:   68464:825683d32fd6
parent:      68463:d674b557600c
parent:      68462:fd2b3eac6756
user:        Gregory P. Smith <greg at krypto.org>
date:        Mon Mar 14 14:14:42 2011 -0400
summary:
  merge default

files:
  

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -128,7 +128,7 @@
                      "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')
 

-- 
Repository URL: http://hg.python.org/cpython