Browse Source

[Test] Rework kill process tree utility

tags/3.5
Vsevolod Stakhov 1 year ago
parent
commit
3a4c01166f
No account linked to committer's email address
1 changed files with 4 additions and 3 deletions
  1. 4
    3
      test/functional/lib/rspamd.py

+ 4
- 3
test/functional/lib/rspamd.py View File

@@ -240,13 +240,14 @@ def shutdown_process_with_children(pid):
process = psutil.Process(pid=pid)
except psutil.NoSuchProcess:
return
children = process.children(recursive=False)
children = process.children(recursive=True)
shutdown_process(process)
for child in children:
try:
shutdown_process(child)
except:
child.kill()
except psutil.NoSuchProcess:
pass
psutil.wait_procs(children, timeout=KILL_WAIT)

def write_to_stdin(process_handle, text):
if not isinstance(text, bytes):

Loading…
Cancel
Save