mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 23:55:27 +00:00
Code Issues Releases Wiki Activity

Merge branch '1525-inline-system-test-failed-need-to-wait-for-zone-to-be-loaded' into 'master'

Browse Source 
Resolve "inline system test failed, need to wait for zone to be loaded."

Closes #1525

See merge request isc-projects/bind9!2796
This commit is contained in:
Ondřej Surý
2020-01-08 07:23:42 +00:00
parent cd17b773b1 2dc4d72fa9
commit 3bce0c2c20
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bin/tests/system/inline/tests.sh
View File

@@ -1332,18 +1332,12 @@ ret=0
mv Kdelayedkeys* ns3/ mv Kdelayedkeys* ns3/
$RNDCCMD 10.53.0.3 loadkeys delayedkeys > rndc.out.ns3.pre.test$n 2>&1 || ret=1 $RNDCCMD 10.53.0.3 loadkeys delayedkeys > rndc.out.ns3.pre.test$n 2>&1 || ret=1
# Wait until the zone is signed. # Wait until the zone is signed.
ans=1 check_done_signing () (
for i in 1 2 3 4 5 6 7 8 9 10 $RNDCCMD 10.53.0.3 signing -list delayedkeys > signing.out.test$n 2>&1
do num=`grep "Done signing with" signing.out.test$n | wc -l`
$RNDCCMD 10.53.0.3 signing -list delayedkeys > signing.out.test$n 2>&1 [ $num -eq 2 ]
num=`grep "Done signing with" signing.out.test$n | wc -l` )
if [ $num -eq 2 ]; then retry_quiet 10 check_done_signing || ret=1
ans=0
break
fi
sleep 1
done
if [ $ans != 0 ]; then ret=1; fi
# Halt rather than stopping the server to prevent the master file from being # Halt rather than stopping the server to prevent the master file from being
# flushed upon shutdown since we specifically want to avoid it. # flushed upon shutdown since we specifically want to avoid it.
$PERL $SYSTEMTESTTOP/stop.pl --use-rndc --halt --port ${CONTROLPORT} inline ns3 $PERL $SYSTEMTESTTOP/stop.pl --use-rndc --halt --port ${CONTROLPORT} inline ns3
@@ -1362,6 +1356,7 @@ $PERL $SYSTEMTESTTOP/start.pl --noclean --restart --port ${PORT} inline ns3
# unless the records contained in it were scheduled for resigning, no resigning # unless the records contained in it were scheduled for resigning, no resigning
# event will be scheduled at all since the secure zone master file contains no # event will be scheduled at all since the secure zone master file contains no
# DNSSEC records. # DNSSEC records.
wait_for_log 20 "all zones loaded" ns3/named.run || ret=1
$RNDCCMD 10.53.0.3 zonestatus delayedkeys > rndc.out.ns3.post.test$n 2>&1 || ret=1 $RNDCCMD 10.53.0.3 zonestatus delayedkeys > rndc.out.ns3.post.test$n 2>&1 || ret=1
grep "next resign node:" rndc.out.ns3.post.test$n > /dev/null || ret=1 grep "next resign node:" rndc.out.ns3.post.test$n > /dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi