From: Mark Andrews <marka@isc.org>
Date: Tue, 14 Jan 2020 06:08:25 +0000 (+1100)
Subject: wait for root server to complete reloading
X-Git-Tag: v9.11.16~14^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=85af984040acc11f6e01a47c93126cec9e68db90;p=thirdparty%2Fbind9.git

wait for root server to complete reloading

(cherry picked from commit 784e64f238482e4e58ea57ebe84e0e7c96680130)
---

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index dc07c3daf4b..62c7c393b53 100644
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -3699,11 +3699,19 @@ $DIG $DIGOPTS . dnskey +ednsopt=KEY-TAG:fffe +ednsopt=KEY-TAG:fffd @10.53.0.1 >
 grep "trust-anchor-telemetry './IN' from .* 65534" ns1/named.run > /dev/null || ret=1
 grep "trust-anchor-telemetry './IN' from .* 65533" ns1/named.run > /dev/null && ret=1
 $PERL $SYSTEMTESTTOP/stop.pl dnssec ns1 || ret=1
+nextpart ns1/named.run > /dev/null
 $PERL $SYSTEMTESTTOP/start.pl --noclean --restart --port ${PORT} dnssec ns1 || ret=1
 n=`expr $n + 1`
 test "$ret" -eq 0 || echo_i "failed"
 status=`expr $status + $ret`
 
+echo_i "waiting for root server to finish reloading ($n)"
+ret=0
+wait_for_log "all zones loaded" ns1/named.run || ret=1
+n=`expr $n + 1`
+test "$ret" -eq 0 || echo_i "failed"
+status=`expr $status + $ret`
+
 echo_i "check that DNAME at apex with NSEC3 is correctly signed (dnssec-signzone) ($n)"
 ret=0
 $DIG $DIGOPTS txt dname-at-apex-nsec3.example @10.53.0.3 > dig.out.ns3.test$n || ret=1