Skip to content

Commit cc5c728

Browse files
committed
Fix signal handler in test.
1 parent 240f86d commit cc5c728

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

Lib/test/_test_multiprocessing.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,12 +354,16 @@ def test_sigterm(self):
354354
else:
355355
os.kill(pid, signal.SIGTERM)
356356
def handler(*args):
357-
raise RuntimeError('join took too long: %s' % p)
357+
raise RuntimeError('waitpid() took too long')
358358
old_handler = signal.signal(signal.SIGALRM, handler)
359359
try:
360360
signal.alarm(10)
361361
pid_status = os.waitpid(pid, 0)
362362
self.assertEqual(pid_status[0], pid)
363+
except RuntimeError:
364+
print('os.waitpid() =',
365+
os.waitpid(pid, os.WNOHANG), file=sys.stderr)
366+
raise
363367
finally:
364368
signal.alarm(0)
365369
signal.signal(signal.SIGALRM, old_handler)

0 commit comments

Comments
 (0)