Abort named if 'rndc stop' or 'kill TERM' has failed to shutdown

(cherry picked from commit c3c7f5849cb192cb558226a1ceac84c639c52512)

diff --git a/bin/tests/system/shutdown/tests-shutdown.py b/bin/tests/system/shutdown/tests-shutdown.py
index 60522690d9f4c9802a740550593946b148e7462a..eb205cfa86f4cfb755d43c6063b7808b335ab4ea 100755 (executable)
--- a/bin/tests/system/shutdown/tests-shutdown.py
+++ b/bin/tests/system/shutdown/tests-shutdown.py
@@ -13,6 +13,7 @@
 from concurrent.futures import ThreadPoolExecutor, as_completed
 import os
 import random
+import signal
 import subprocess
 from string import ascii_lowercase as letters
 import time
@@ -185,7 +186,14 @@ def test_named_shutdown(named_port, control_port):
             time.sleep(1)
 
         if not is_dead:
-            named_proc.kill()
+            named_proc.send_signal(signal.SIGABRT)
+            for _ in range(MAX_TIMEOUT):
+                if named_proc.poll() is not None:
+                    is_dead = True
+                    break
+                time.sleep(1)
+            if not is_dead:
+                named_proc.kill()
 
         assert is_dead
         # Ensures that named exited gracefully.