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

add test numbers as use them in file names

Browse Source
This commit is contained in:
Mark Andrews
2018-02-21 13:31:05 +11:00
parent aa7964dd4b
commit 034450ba02
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
bin/tests/system/rpz/tests.sh
View File

@@ -26,6 +26,7 @@ ns7=$ns.7 # another rewriting resolver
HAVE_CORE= HAVE_CORE=
status=0 status=0
t=0
DEBUG= DEBUG=
SAVE_RESULTS= SAVE_RESULTS=
@@ -291,7 +292,8 @@ ckstatsrange () {
# $1=message $2=optional test file name # $1=message $2=optional test file name
start_group () { start_group () {
ret=0 ret=0
test -n "$1" && date "+I:${TS}checking $1" t=`expr $t + 1`
test -n "$1" && date "+I:${TS}checking $1 (${t})"
TEST_FILE=$2 TEST_FILE=$2
if test -n "$TEST_FILE"; then if test -n "$TEST_FILE"; then
GROUP_NM="-$TEST_FILE" GROUP_NM="-$TEST_FILE"
@@ -730,12 +732,14 @@ if test -n "$EMSGS"; then
egrep 'invalid rpz|rpz.*failed' ns*/named.run | sed -e '10,$d' -e 's/^/I: /' egrep 'invalid rpz|rpz.*failed' ns*/named.run | sed -e '10,$d' -e 's/^/I: /'
fi fi
echo "I:checking that ttl values are not zeroed when qtype is '*'" t=`expr $t + 1`
$DIG +noall +answer -p 5300 @$ns3 any a3-2.tld2 > dig.out.any echo "I:checking that ttl values are not zeroed when qtype is '*' (${t})"
ttl=`awk '/a3-2 tld2 text/ {print $2}' dig.out.any` $DIG +noall +answer -p 5300 @$ns3 any a3-2.tld2 > dig.out.$t
ttl=`awk '/a3-2 tld2 text/ {print $2}' dig.out.$t`
if test ${ttl:=0} -eq 0; then setret I:failed; fi if test ${ttl:=0} -eq 0; then setret I:failed; fi
t=`expr $t + 1`
echo "I:checking rpz updates/transfers with parent nodes added after children" \ echo "I:checking rpz updates/transfers with parent nodes added after children" \
| tr -d '\n' | tr -d '\n'
# regression test for RT #36272: the success condition # regression test for RT #36272: the success condition
@@ -762,22 +766,24 @@ for i in 1 2 3 4 5; do
nsd $ns5 delete '*.example.com.policy1.' example.com.policy1. nsd $ns5 delete '*.example.com.policy1.' example.com.policy1.
echo . | tr -d '\n' echo . | tr -d '\n'
done done
echo echo " (${t})"
echo "I:checking that going from an empty policy zone works" t=`expr $t + 1`
echo "I:checking that going from an empty policy zone works (${t})"
nsd $ns5 add '*.x.servfail.policy2.' x.servfail.policy2. nsd $ns5 add '*.x.servfail.policy2.' x.servfail.policy2.
sleep 1 sleep 1
$RNDCCMD $ns7 reload policy2 $RNDCCMD $ns7 reload policy2
$DIG z.x.servfail -p 5300 @$ns7 > dig.out.ns7 $DIG z.x.servfail -p 5300 @$ns7 > dig.out.${t}
grep NXDOMAIN dig.out.ns7 > /dev/null || setret I:failed grep NXDOMAIN dig.out.${t} > /dev/null || setret I:failed
# dnsrps does not allow NS RRs in policy zones, so this check # dnsrps does not allow NS RRs in policy zones, so this check
# with dnsrps results in no rewriting. # with dnsrps results in no rewriting.
if [ "$DNSRPS_TEST_MODE" = 1 ]; then if [ "$DNSRPS_TEST_MODE" = 1 ]; then
echo "I:checking rpz with delegation fails correctly" t=`expr $t + 1`
$DIG -p 5300 @$ns3 ns example.com > dig.out.delegation echo "I:checking rpz with delegation fails correctly (${t})"
grep "status: SERVFAIL" dig.out.delegation > /dev/null || setret "I:failed" $DIG -p 5300 @$ns3 ns example.com > dig.out.$t
grep "status: SERVFAIL" dig.out.$t > /dev/null || setret "I:failed"
fi fi
[ $status -ne 0 ] && pf=fail || pf=pass [ $status -ne 0 ] && pf=fail || pf=pass