upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-26 09:39:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'each-test-fixes-v9_16' into 'v9_16'

Browse source 
Fix test errors that caused intermittent failures

See merge request isc-projects/bind9!5534
This commit is contained in:
Evan Hunt 2021-10-27 20:21:58 +00:00
commit 3aca4fc81f
4 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/tests/system/catz/tests.sh
View file

@ -217,7 +217,7 @@ echo_i "wait for secondary to be updated again ($n)"
ret=0
wait_for_txt() {
dig_with_opts @10.53.0.2 TXT foo.dom1.example. > dig.out.test$n || return 1
grep "ANSWER: 1," dig.out.test$n > /dev/null || return 1
grep "ANSWER: 2," dig.out.test$n > /dev/null || return 1
grep "status: NOERROR" dig.out.test$n > /dev/null || return 1
grep "IN.TXT." dig.out.test$n > /dev/null || return 1
}

2
bin/tests/system/cds/checktime.pl
View file

@ -22,4 +22,4 @@ while (<>) {
die "missing notbefore time" unless $notbefore;
die "missing inception time" unless $inception;
my $delta = $inception - $notbefore;
die "bad inception time $delta" unless abs($delta - $target) < 3;
die "bad inception time $delta" unless abs($delta - $target) <= 3;

4
bin/tests/system/digdelv/tests.sh
View file

@ -1076,7 +1076,7 @@ if [ -x "$MDIG" ] ; then
n=$((n+1))
echo_i "check mdig +yaml output ($n)"
ret=0
mdig_with_opts +yaml @10.53.0.3 -t any ns2.example > dig.out.test$n 2>&1 || ret=1
mdig_with_opts +yaml @10.53.0.3 -t any ns2.example > dig.out.test$n || ret=1
value=$($PYTHON yamlget.py dig.out.test$n 0 message response_message_data status || ret=1)
[ "$value" = "NOERROR" ] || ret=1
value=$($PYTHON yamlget.py dig.out.test$n 0 message response_message_data QUESTION_SECTION 0 || ret=1)
@ -1326,7 +1326,7 @@ if [ -x "$DELV" ] ; then
n=$((n+1))
echo_i "check delv +yaml output ($n)"
ret=0
delv_with_opts +yaml @10.53.0.3 any ns2.example > delv.out.test$n 2>&1 || ret=1
delv_with_opts +yaml @10.53.0.3 any ns2.example > delv.out.test$n || ret=1
value=$($PYTHON yamlget.py delv.out.test$n status || ret=1)
[ "$value" = "success" ] || ret=1
value=$($PYTHON yamlget.py delv.out.test$n query_name || ret=1)

20
bin/tests/system/statistics/tests.sh
View file

@ -91,7 +91,11 @@ $DIGCMD +tries=2 +time=1 +recurse @10.53.0.3 foo.info. any > /dev/null 2>&1
ret=0
echo_i "dumping updated stats for ns3 ($n)"
rndc_stats ns3 10.53.0.3 || ret=1
getstats() {
rndc_stats ns3 10.53.0.3 || return 1
grep "2 recursing clients" $last_stats > /dev/null || return 1
}
retry_quiet 5 getstats || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
@ -137,6 +141,13 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
ret=0
echo_i "checking priming queries are counted ($n)"
grep "priming queries" $last_stats > /dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
ret=0
echo_i "checking that zones with slash are properly shown in XML output ($n)"
if $FEATURETEST --have-libxml2 && [ -x ${CURL} ] ; then
@ -239,13 +250,6 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
ret=0
echo_i "checking priming queries are counted ($n)"
grep "1 priming queries" $last_stats
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo_i "Check that 'zone-statistics full;' is processed by 'rndc reconfig' ($n)"
ret=0
# off by default