From 969d9235367c7cba01e259cc633cb37f7134f13f Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 25 Oct 2017 09:21:14 +1100 Subject: [PATCH] 4783. [test] dnssec: 'check that NOTIFY is sent at the end of NSEC3 chain generation failed' required more time on some machines for the IXFR to complete. [RT #46388] --- CHANGES | 4 ++++ bin/tests/system/dnssec/tests.sh | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index faec7632f1..1b59468510 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +4783. [test] dnssec: 'check that NOTIFY is sent at the end of + NSEC3 chain generation failed' required more time + on some machines for the IXFR to complete. [RT #46388] + 4782. [test] dnssec: 'checking positive and negative validation with negative trust anchors' required more time to complete on some machines. [RT #46386] diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh index dd8cee57ad..abef3f9e5b 100644 --- a/bin/tests/system/dnssec/tests.sh +++ b/bin/tests/system/dnssec/tests.sh @@ -2501,9 +2501,15 @@ do done; grep "ANSWER: 3," dig.out.ns2.test$n > /dev/null || ret=1 if [ $ret != 0 ]; then echo "I:nsec3 chain generation not complete"; fi -sleep 3 $DIG $DIGOPTS +noauth +nodnssec soa nsec3chain-test @10.53.0.2 > dig.out.ns2.test$n || ret=1 -$DIG $DIGOPTS +noauth +nodnssec soa nsec3chain-test @10.53.0.3 > dig.out.ns3.test$n || ret=1 +s2=`awk '$4 == "SOA" { print $7}' dig.out.ns2.test$n` +for i in 1 2 3 4 5 6 7 8 9 10 +do + $DIG $DIGOPTS +noauth +nodnssec soa nsec3chain-test @10.53.0.3 > dig.out.ns3.test$n || ret=1 + s3=`awk '$4 == "SOA" { print $7}' dig.out.ns2.test$n` + test "$s2" = "$s3" && break + sleep 1 +done $PERL ../digcomp.pl dig.out.ns2.test$n dig.out.ns3.test$n || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi