mirror of
https://github.com/python/cpython.git
synced 2025-09-27 02:39:58 +00:00
lightly modified version of my patch
[ 971323 ] make test_signal less annoying after some comments on IRC from a highly opinionated australian who wishes to remain anonymous.
This commit is contained in:
parent
c982bbde1c
commit
5c26e86096
1 changed files with 33 additions and 26 deletions
|
@ -17,11 +17,11 @@ script = """
|
||||||
(
|
(
|
||||||
set %(x)s
|
set %(x)s
|
||||||
sleep 2
|
sleep 2
|
||||||
kill -5 %(pid)d
|
kill -HUP %(pid)d
|
||||||
sleep 2
|
sleep 2
|
||||||
kill -2 %(pid)d
|
kill -USR1 %(pid)d
|
||||||
sleep 2
|
sleep 2
|
||||||
kill -3 %(pid)d
|
kill -USR2 %(pid)d
|
||||||
) &
|
) &
|
||||||
""" % vars()
|
""" % vars()
|
||||||
|
|
||||||
|
@ -37,16 +37,17 @@ def handlerB(*args):
|
||||||
raise HandlerBCalled, args
|
raise HandlerBCalled, args
|
||||||
|
|
||||||
signal.alarm(20) # Entire test lasts at most 20 sec.
|
signal.alarm(20) # Entire test lasts at most 20 sec.
|
||||||
signal.signal(5, handlerA)
|
hup = signal.signal(signal.SIGHUP, handlerA)
|
||||||
signal.signal(2, handlerB)
|
usr1 = signal.signal(signal.SIGUSR1, handlerB)
|
||||||
signal.signal(3, signal.SIG_IGN)
|
usr2 = signal.signal(signal.SIGUSR2, signal.SIG_IGN)
|
||||||
signal.signal(signal.SIGALRM, signal.default_int_handler)
|
alrm = signal.signal(signal.SIGALRM, signal.default_int_handler)
|
||||||
|
|
||||||
os.system(script)
|
|
||||||
|
|
||||||
print "starting pause() loop..."
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
os.system(script)
|
||||||
|
|
||||||
|
print "starting pause() loop..."
|
||||||
|
|
||||||
|
try:
|
||||||
while 1:
|
while 1:
|
||||||
if verbose:
|
if verbose:
|
||||||
print "call pause()..."
|
print "call pause()..."
|
||||||
|
@ -60,6 +61,12 @@ try:
|
||||||
else:
|
else:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
if verbose:
|
if verbose:
|
||||||
print "KeyboardInterrupt (assume the alarm() went off)"
|
print "KeyboardInterrupt (assume the alarm() went off)"
|
||||||
|
|
||||||
|
finally:
|
||||||
|
signal.signal(signal.SIGHUP, hup)
|
||||||
|
signal.signal(signal.SIGUSR1, usr1)
|
||||||
|
signal.signal(signal.SIGUSR2, usr2)
|
||||||
|
signal.signal(signal.SIGALRM, alrm)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue