From 3a4c01166ffc63c0b92e10f3a6ff21f85eb43449 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Sat, 31 Dec 2022 21:35:56 +0000 Subject: [PATCH] [Test] Rework kill process tree utility --- test/functional/lib/rspamd.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/functional/lib/rspamd.py b/test/functional/lib/rspamd.py index 2bb5ce3d2..49c21a449 100644 --- a/test/functional/lib/rspamd.py +++ b/test/functional/lib/rspamd.py @@ -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): -- 2.39.5