[Test] Rework kill process tree utility

rspamd · Dec 31, 2022 · 3a4c011 · 3a4c011
1 parent a953819
commit 3a4c011
Showing 1 changed file with 4 additions and 3 deletions.
diff --git 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):