From c3c7f5849cb192cb558226a1ceac84c639c52512 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Mon, 12 Apr 2021 18:00:07 +1000 Subject: [PATCH] Abort named if 'rndc stop' or 'kill TERM' has failed to shutdown --- bin/tests/system/shutdown/tests-shutdown.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/bin/tests/system/shutdown/tests-shutdown.py b/bin/tests/system/shutdown/tests-shutdown.py index 93a0770cad..eaf8d3ab3b 100755 --- 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 @@ -182,7 +183,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.