[Test] Rework kill process tree utility

diff --git a/test/functional/lib/rspamd.py b/test/functional/lib/rspamd.py
index 2bb5ce3d26fc76512bb91131774f40f929ad48b3..49c21a449b8af02ad27bdc9e50396007d5f636e3 100644 (file)
--- 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):