KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not hang forever waiting for child death

Browse Source
This commit is contained in:
Kovid Goyal 2022-07-05 21:49:49 +05:30
parent 8011801549
commit dc84e3de67
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kitty_tests/prewarm.py
View File

@ -25,7 +25,7 @@ class Prewarm(BaseTest):
maxDiff = None maxDiff = None
def test_socket_prewarming(self): def test_socket_prewarming(self):
from kitty.prewarm import fork_prewarm_process from kitty.prewarm import fork_prewarm_process, wait_for_child_death
exit_code = 17 exit_code = 17
src = '''\ src = '''\
def socket_child_main(exit_code=0): def socket_child_main(exit_code=0):
@ -69,7 +69,10 @@ def socket_child_main(exit_code=0):
f.write(stdin_data) f.write(stdin_data)
with open(stdout_r) as f: with open(stdout_r) as f:
stdout_data = f.read() stdout_data = f.read()
status = os.waitpid(pty.child_pid, 0)[1] status = wait_for_child_death(pty.child_pid, timeout=5)
if status is None:
os.kill(pty.child_pid, signal.SIGKILL)
self.assertIsNotNone(status, 'prewarm wrapper process did not exit')
with suppress(AttributeError): with suppress(AttributeError):
self.assertEqual(os.waitstatus_to_exitcode(status), exit_code) self.assertEqual(os.waitstatus_to_exitcode(status), exit_code)
pty.wait_till(lambda: 'hello' in pty.screen_contents()) pty.wait_till(lambda: 'hello' in pty.screen_contents())