From: Michal Nowak <mnowak@isc.org>
Date: Mon, 16 Sep 2024 12:55:06 +0000 (+0200)
Subject: Downgrade "timeout" and "attempts" arguments in shutdown
X-Git-Tag: v9.21.2~21^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=463ab2f3f5f649c3fef162dbd05890c34eac43b4;p=thirdparty%2Fbind9.git

Downgrade "timeout" and "attempts" arguments in shutdown

The shutdown system test sends queries when named is shutting down, not
in an attempt to get answers but to destabilize the server into a crash.
With isctest.query.udp() defaulting to try up to ten times with a
ten-second timeout to get a response we don't care about from a likely
terminated server, we make the test run much longer than needed because
of retries and long timeouts.
---

diff --git a/bin/tests/system/shutdown/tests_shutdown.py b/bin/tests/system/shutdown/tests_shutdown.py
index 121feed7b7a..566a84fc8e4 100755
--- a/bin/tests/system/shutdown/tests_shutdown.py
+++ b/bin/tests/system/shutdown/tests_shutdown.py
@@ -101,7 +101,11 @@ def do_work(named_proc, resolver_ip, instance, kill_method, n_workers, n_queries
 
                 qname = relname + ".test"
                 msg = dns.message.make_query(qname, "A")
-                futures[executor.submit(isctest.query.udp, msg, resolver_ip)] = tag
+                futures[
+                    executor.submit(
+                        isctest.query.udp, msg, resolver_ip, timeout=1, attempts=1
+                    )
+                ] = tag
             elif shutdown:  # We attempt to stop named in the middle
                 shutdown = False
                 if kill_method == "rndc":