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:
Michael W. Hudson 2004-06-11 18:09:28 +00:00
parent c982bbde1c
commit 5c26e86096

View file

@ -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,11 +37,12 @@ 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)
try:
os.system(script) os.system(script)
print "starting pause() loop..." print "starting pause() loop..."
@ -63,3 +64,9 @@ try:
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)