mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

Merge branch '893-do-not-rely-on-default-dig-options-in-system-tests' into 'master'

Browse Source 
Do not rely on default dig options in system tests

Closes #893

See merge request isc-projects/bind9!1556
This commit is contained in:
Michał Kępień
2019-04-03 07:21:56 -04:00
parent 7e069cb16a b6cce0fb8b
commit 23e6a908df
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/tests/system/legacy/tests.sh
View File

@@ -12,7 +12,7 @@
SYSTEMTESTTOP=.. SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh . $SYSTEMTESTTOP/conf.sh
DIGOPTS="-p ${PORT}" DIGOPTS="-p ${PORT} +tries=3 +time=5"
status=0 status=0
n=0 n=0

4
bin/tests/system/resolver/tests.sh
View File

@@ -770,7 +770,7 @@ status=`expr $status + $ret`
n=`expr $n + 1` n=`expr $n + 1`
echo_i "check that the resolver accepts a reply with empty question section with TC=1 and retries over TCP ($n)" echo_i "check that the resolver accepts a reply with empty question section with TC=1 and retries over TCP ($n)"
ret=0 ret=0
$DIG $DIGOPTS @10.53.0.5 truncated.no-questions. a > dig.ns5.out.${n} || ret=1 $DIG $DIGOPTS @10.53.0.5 truncated.no-questions. a +tries=3 +time=5 > dig.ns5.out.${n} || ret=1
grep "status: NOERROR" dig.ns5.out.${n} > /dev/null || ret=1 grep "status: NOERROR" dig.ns5.out.${n} > /dev/null || ret=1
grep "ANSWER: 1," dig.ns5.out.${n} > /dev/null || ret=1 grep "ANSWER: 1," dig.ns5.out.${n} > /dev/null || ret=1
grep "1\.2\.3\.4" dig.ns5.out.${n} > /dev/null || ret=1 grep "1\.2\.3\.4" dig.ns5.out.${n} > /dev/null || ret=1
@@ -780,7 +780,7 @@ status=`expr $status + $ret`
n=`expr $n + 1` n=`expr $n + 1`
echo_i "check that the resolver rejects a reply with empty question section with TC=0 ($n)" echo_i "check that the resolver rejects a reply with empty question section with TC=0 ($n)"
ret=0 ret=0
$DIG $DIGOPTS @10.53.0.5 not-truncated.no-questions. a > dig.ns5.out.${n} || ret=1 $DIG $DIGOPTS @10.53.0.5 not-truncated.no-questions. a +tries=3 +time=5 > dig.ns5.out.${n} || ret=1
grep "status: NOERROR" dig.ns5.out.${n} > /dev/null && ret=1 grep "status: NOERROR" dig.ns5.out.${n} > /dev/null && ret=1
grep "ANSWER: 1," dig.ns5.out.${n} > /dev/null && ret=1 grep "ANSWER: 1," dig.ns5.out.${n} > /dev/null && ret=1
grep "1\.2\.3\.4" dig.ns5.out.${n} > /dev/null && ret=1 grep "1\.2\.3\.4" dig.ns5.out.${n} > /dev/null && ret=1

4
bin/tests/system/rpzrecurse/tests.sh
View File

@@ -264,7 +264,7 @@ for mode in native dnsrps; do
t=`expr $t + 1` t=`expr $t + 1`
echo_i "running dig to follow CNAME (blocks, so runs in the background) (${t})" echo_i "running dig to follow CNAME (blocks, so runs in the background) (${t})"
add_test_marker 10.53.0.2 add_test_marker 10.53.0.2
$DIG $DIGOPTS @10.53.0.2 -p ${PORT} www.test.example.org A > dig.out.${t} & $DIG $DIGOPTS @10.53.0.2 -p ${PORT} www.test.example.org A +time=5 > dig.out.${t} &
sleep 1 sleep 1
echo_i "removing the NSDNAME policy" echo_i "removing the NSDNAME policy"
cp ns2/db.6c.00.policy.local ns2/db.6a.00.policy.local cp ns2/db.6c.00.policy.local ns2/db.6a.00.policy.local
@@ -316,7 +316,7 @@ for mode in native dnsrps; do
t=`expr $t + 1` t=`expr $t + 1`
echo_i "running dig to follow CNAME (blocks, so runs in the background) (${t})" echo_i "running dig to follow CNAME (blocks, so runs in the background) (${t})"
add_test_marker 10.53.0.2 add_test_marker 10.53.0.2
$DIG $DIGOPTS @10.53.0.2 -p ${PORT} www.test.example.org A > dig.out.${t} & $DIG $DIGOPTS @10.53.0.2 -p ${PORT} www.test.example.org A +time=5 > dig.out.${t} &
sleep 1 sleep 1
echo_i "removing the policy zone" echo_i "removing the policy zone"
cp ns2/named.default.conf ns2/named.conf cp ns2/named.default.conf ns2/named.conf