Be more patient when stopping servers in the system tests

When the TCP test is run on the busy server, the server might take a
while to wind the server down because it might still be processing all
that 300k invalid XFR requests.

Increate the rncd wait time to 120 seconds, the SIGTERM time to 300
seconds, and reduce the time to wait for ans servers from 1200 second
to just 120 seconds.

(cherry picked from commit d97147232157a87ccb155b2d9c312eb7d1a21b4f)

diff --git a/bin/tests/system/stop.pl b/bin/tests/system/stop.pl
index 6783b852353d81ee8973e5a0c4b20902448291e9..307e850c8f61e04ebbcb09d1bb70966c3523bc36 100644 (file)
--- a/bin/tests/system/stop.pl
+++ b/bin/tests/system/stop.pl
@@ -97,7 +97,7 @@ if ($use_rndc) {
                stop_rndc($name, $rndc_port);
        }
 
-       @ns = wait_for_servers(30, @ns);
+       @ns = wait_for_servers(120, @ns);
 }
 
 # Pass 2: SIGTERM
@@ -105,13 +105,13 @@ foreach my $name (@ns) {
        stop_signal($name, "TERM");
 }
 
-@ns = wait_for_servers(60, @ns);
+@ns = wait_for_servers(300, @ns);
 
 foreach my $name(@ans) {
        stop_signal($name, "TERM", 1);
 }
 
-@ans = wait_for_servers(1200, @ans);
+@ans = wait_for_servers(300, @ans);
 
 # Pass 3: SIGABRT
 foreach my $name (@ns) {