From 585e3543caa39f1e854e715a1135f97529b35724 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 20 Apr 2021 14:56:07 +1000 Subject: [PATCH] Wait for named to start If we don't wait for named to finish starting, 'rndc stop' may fail due to the listen limit being reached in named leading to a false negative test (cherry picked from commit 8d5870f9df858fb9cea24474aca30f3f1f35078c) --- bin/tests/system/shutdown/tests-shutdown.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/tests/system/shutdown/tests-shutdown.py b/bin/tests/system/shutdown/tests-shutdown.py index eb205cfa86..280ed3ee50 100755 --- a/bin/tests/system/shutdown/tests-shutdown.py +++ b/bin/tests/system/shutdown/tests-shutdown.py @@ -171,7 +171,13 @@ def test_named_shutdown(named_port, control_port): # In both methods named should exit gracefully. for kill_method in ("rndc", "sigterm"): named_proc = launch_named() - time.sleep(2) + # wait for named to finish loading + for _ in range(10): + try: + resolver.query('version.bind', 'TXT', 'CH') + break + except (dns.resolver.NoNameservers, dns.exception.Timeout): + time.sleep(1) do_work(named_proc, resolver, rndc_cmd, kill_method, n_workers=12, n_queries=16)