summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Curtin <brian.curtin@gmail.com>2010-04-05 19:04:23 (GMT)
committerBrian Curtin <brian.curtin@gmail.com>2010-04-05 19:04:23 (GMT)
commitfce1d31d4710c0280e2b646f72174de79a713430 (patch)
tree274738832e9879ae4c371069bd04bb0a63be8f36
parent56506a6ed2380cddc0e70d2df254ce4724b43629 (diff)
downloadcpython-fce1d31d4710c0280e2b646f72174de79a713430.zip
cpython-fce1d31d4710c0280e2b646f72174de79a713430.tar.gz
cpython-fce1d31d4710c0280e2b646f72174de79a713430.tar.bz2
Fix a failing test on an apparently slow Windows buildbot.
On slower Windows machines, waiting 0.1 seconds can sometimes not be enough for a subprocess to start and be ready to accept signals, causing the test to fail. One buildbot is also choking on input()/EOFError so that was changed to not depend on input.
-rw-r--r--Lib/test/test_os.py4
-rw-r--r--Lib/test/win_console_handler.py3
2 files changed, 4 insertions, 3 deletions
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 2fc0d07..ef85be5 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -697,11 +697,11 @@ class Win32KillTests(unittest.TestCase):
"win_console_handler.py")],
creationflags=subprocess.CREATE_NEW_PROCESS_GROUP)
# Let the interpreter startup before we send signals. See #3137.
- time.sleep(0.1)
+ time.sleep(0.5)
os.kill(proc.pid, event)
# proc.send_signal(event) could also be done here.
# Allow time for the signal to be passed and the process to exit.
- time.sleep(0.1)
+ time.sleep(0.5)
if not proc.poll():
# Forcefully kill the process if we weren't able to signal it.
os.kill(proc.pid, signal.SIGINT)
diff --git a/Lib/test/win_console_handler.py b/Lib/test/win_console_handler.py
index 5c6c741..17bbe1a 100644
--- a/Lib/test/win_console_handler.py
+++ b/Lib/test/win_console_handler.py
@@ -39,4 +39,5 @@ if __name__ == "__main__":
exit(-1)
# Do nothing but wait for the signal
- input()
+ while True:
+ pass