From: Mark Andrews Date: Mon, 10 Dec 2018 05:59:27 +0000 (+1100) Subject: allow a small about of time for the syncptr event to be processed X-Git-Tag: v9.13.6~111^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3bca52ca0740c412150d817bac1a741c63d5fc70;p=thirdparty%2Fbind9.git allow a small about of time for the syncptr event to be processed --- diff --git a/bin/tests/system/dyndb/tests.sh b/bin/tests/system/dyndb/tests.sh index 6b10357b890..2bbff206b21 100644 --- a/bin/tests/system/dyndb/tests.sh +++ b/bin/tests/system/dyndb/tests.sh @@ -39,7 +39,7 @@ EOF newtest "adding $host $type $ip" $NSUPDATE ns1/update.txt > /dev/null 2>&1 || { [ "$should_fail" ] || \ - echo_i "update failed for $host $type $ip" + echo_i "update failed for $host $type $ip" return 1 } @@ -48,16 +48,21 @@ EOF lines=`echo "$out" | grep "$ip" | wc -l` [ $lines -eq 1 ] || { [ "$should_fail" ] || \ - echo_i "dig output incorrect for $host $type $cmd: $out" + echo_i "dig output incorrect for $host $type $cmd: $out" return 1 } - out=`$DIG $DIGOPTS +noall +answer -x $ip` - echo $out > added.ptr.out.$n - lines=`echo "$out" | grep "$host" | wc -l` + for i in 1 2 3 4 5 6 7 8 9 10 + do + out=`$DIG $DIGOPTS +noall +answer -x $ip` + echo $out > added.ptr.out.$n + lines=`echo "$out" | grep "$host" | wc -l` + [ $lines -eq 1 ] && break; + $PERL -e 'select(undef, undef, undef, 0.1);' + done [ $lines -eq 1 ] || { [ "$should_fail" ] || \ - echo_i "dig reverse output incorrect for $host $type $cmd: $out" + echo_i "dig reverse output incorrect for $host $type $cmd: $out" return 1 } @@ -79,7 +84,7 @@ EOF newtest "deleting $host $type (was $ip)" $NSUPDATE ns1/update.txt > /dev/null 2>&1 || { [ "$should_fail" ] || \ - echo_i "update failed deleting $host $type" + echo_i "update failed deleting $host $type" return 1 } @@ -88,16 +93,21 @@ EOF lines=`echo "$out" | grep "$ip" | wc -l` [ $lines -eq 0 ] || { [ "$should_fail" ] || \ - echo_i "dig output incorrect for $host $type $cmd: $out" + echo_i "dig output incorrect for $host $type $cmd: $out" return 1 } - out=`$DIG $DIGOPTS +noall +answer -x $ip` - echo $out > deleted.ptr.out.$n - lines=`echo "$out" | grep "$host" | wc -l` + for i in 1 2 3 4 5 6 7 8 9 10 + do + out=`$DIG $DIGOPTS +noall +answer -x $ip` + echo $out > deleted.ptr.out.$n + lines=`echo "$out" | grep "$host" | wc -l` + [ $lines -eq 0 ] && break + $PERL -e 'select(undef, undef, undef, 0.1);' + done [ $lines -eq 0 ] || { [ "$should_fail" ] || \ - echo_i "dig reverse output incorrect for $host $type $cmd: $out" + echo_i "dig reverse output incorrect for $host $type $cmd: $out" return 1 }