mirror of https://github.com/python/cpython
Fixes Issue #15507: test_subprocess's test_send_signal could fail if the test
runner were run in an environment where the process inherited an ignore setting for SIGINT. Restore the SIGINT handler to the desired KeyboardInterrupt raising one during that test.
This commit is contained in:
commit
6cc50391a6
|
@ -1432,16 +1432,22 @@ class POSIXProcessTestCase(BaseTestCase):
|
|||
def _kill_process(self, method, *args):
|
||||
# Do not inherit file handles from the parent.
|
||||
# It should fix failures on some platforms.
|
||||
p = subprocess.Popen([sys.executable, "-c", """if 1:
|
||||
import sys, time
|
||||
sys.stdout.write('x\\n')
|
||||
sys.stdout.flush()
|
||||
time.sleep(30)
|
||||
"""],
|
||||
close_fds=True,
|
||||
stdin=subprocess.PIPE,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE)
|
||||
# Also set the SIGINT handler to the default to make sure it's not
|
||||
# being ignored (some tests rely on that.)
|
||||
old_handler = signal.signal(signal.SIGINT, signal.default_int_handler)
|
||||
try:
|
||||
p = subprocess.Popen([sys.executable, "-c", """if 1:
|
||||
import sys, time
|
||||
sys.stdout.write('x\\n')
|
||||
sys.stdout.flush()
|
||||
time.sleep(30)
|
||||
"""],
|
||||
close_fds=True,
|
||||
stdin=subprocess.PIPE,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE)
|
||||
finally:
|
||||
signal.signal(signal.SIGINT, old_handler)
|
||||
# Wait for the interpreter to be completely initialized before
|
||||
# sending any signal.
|
||||
p.stdout.read(1)
|
||||
|
|
|
@ -155,6 +155,11 @@ Library
|
|||
Tests
|
||||
-----
|
||||
|
||||
- Issue #15507: test_subprocess's test_send_signal could fail if the test
|
||||
runner were run in an environment where the process inherited an ignore
|
||||
setting for SIGINT. Restore the SIGINT handler to the desired
|
||||
KeyboardInterrupt raising one during that test.
|
||||
|
||||
- Issue #16799: Switched from getopt to argparse style in regrtest's argument
|
||||
parsing. Added more tests for regrtest's argument parsing.
|
||||
|
||||
|
|
Loading…
Reference in New Issue