Kaydet (Commit) 6a53af89 authored tarafından Richard Oudkerk's avatar Richard Oudkerk

Issue #18786: Don't reinstall old SIGUSR1 handler prematurely.

üst d98af985
...@@ -2925,7 +2925,7 @@ class _TestPollEintr(BaseTestCase): ...@@ -2925,7 +2925,7 @@ class _TestPollEintr(BaseTestCase):
@classmethod @classmethod
def _killer(cls, pid): def _killer(cls, pid):
time.sleep(0.5) time.sleep(0.1)
os.kill(pid, signal.SIGUSR1) os.kill(pid, signal.SIGUSR1)
@unittest.skipUnless(hasattr(signal, 'SIGUSR1'), 'requires SIGUSR1') @unittest.skipUnless(hasattr(signal, 'SIGUSR1'), 'requires SIGUSR1')
...@@ -2938,12 +2938,14 @@ class _TestPollEintr(BaseTestCase): ...@@ -2938,12 +2938,14 @@ class _TestPollEintr(BaseTestCase):
try: try:
killer = self.Process(target=self._killer, args=(pid,)) killer = self.Process(target=self._killer, args=(pid,))
killer.start() killer.start()
p = self.Process(target=time.sleep, args=(1,)) try:
p.start() p = self.Process(target=time.sleep, args=(2,))
p.join() p.start()
p.join()
finally:
killer.join()
self.assertTrue(got_signal[0]) self.assertTrue(got_signal[0])
self.assertEqual(p.exitcode, 0) self.assertEqual(p.exitcode, 0)
killer.join()
finally: finally:
signal.signal(signal.SIGUSR1, oldhandler) signal.signal(signal.SIGUSR1, oldhandler)
......
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