Kaydet (Commit) fce1d31d authored tarafından Brian Curtin's avatar Brian Curtin

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.
üst 56506a6e
...@@ -697,11 +697,11 @@ class Win32KillTests(unittest.TestCase): ...@@ -697,11 +697,11 @@ class Win32KillTests(unittest.TestCase):
"win_console_handler.py")], "win_console_handler.py")],
creationflags=subprocess.CREATE_NEW_PROCESS_GROUP) creationflags=subprocess.CREATE_NEW_PROCESS_GROUP)
# Let the interpreter startup before we send signals. See #3137. # Let the interpreter startup before we send signals. See #3137.
time.sleep(0.1) time.sleep(0.5)
os.kill(proc.pid, event) os.kill(proc.pid, event)
# proc.send_signal(event) could also be done here. # proc.send_signal(event) could also be done here.
# Allow time for the signal to be passed and the process to exit. # 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(): if not proc.poll():
# Forcefully kill the process if we weren't able to signal it. # Forcefully kill the process if we weren't able to signal it.
os.kill(proc.pid, signal.SIGINT) os.kill(proc.pid, signal.SIGINT)
......
...@@ -39,4 +39,5 @@ if __name__ == "__main__": ...@@ -39,4 +39,5 @@ if __name__ == "__main__":
exit(-1) exit(-1)
# Do nothing but wait for the signal # Do nothing but wait for the signal
input() while True:
pass
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment