mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Code Issues Releases Wiki Activity

Determine "rpz" system test mode based on $mode rather than $DNSRPS_TEST_MODE

Browse Source 
Change 4897 modified the way the $DNSRPS_TEST_MODE variable is used in
bin/tests/system/rpz/tests.sh without updating all references to it,
which i.a. causes the $native and $dnsrps variables to not be set in the
default testing mode, effectively preventing failed checks from being
propagated to the final result of the test.  Use $mode instead of
$DNSRPS_TEST_MODE where appropriate to fix error handling in the "rpz"
system test.
This commit is contained in:
Michał Kępień
2018-06-26 12:19:41 +02:00
parent dc2c707a98
commit 730c6651a0
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -578,11 +578,11 @@ EOF
addr 127.0.0.1 a3-1.sub3.tld2 # 10 prefer policy for largest NSDNAME
addr 127.0.0.2 a3-1.subsub.sub3.tld2
nxdomain xxx.crash1.tld2 # 12 dns_db_detachnode() crash
if [ "$DNSRPS_TEST_MODE" = dnsrps ]; then
if [ "$mode" = dnsrps ]; then
addr 12.12.12.12 as-ns.tld5. # 13 qname-as-ns
fi
end_group
if [ "$DNSRPS_TEST_MODE" = dnsrps ]; then
if [ "$mode" = dnsrps ]; then
ckstats $ns3 test3 ns3 8
else
ckstats $ns3 test3 ns3 7
@@ -594,7 +594,7 @@ EOF
nochange a3-2.tld2. # 2 exempt rewrite by name
nochange a0-1.tld2. # 3 exempt rewrite by address block
nochange a3-1.tld4 # 4 different NS IP address
if [ "$DNSRPS_TEST_MODE" = dnsrps ]; then
if [ "$mode" = dnsrps ]; then
addr 12.12.12.12 as-ns.tld5. # 5 ip-as-ns
fi
end_group
@@ -607,7 +607,7 @@ EOF
a3-1.tld2. x IN TXT "NSIP walled garden"
EOF
end_group
if [ "$DNSRPS_TEST_MODE" = dnsrps ]; then
if [ "$mode" = dnsrps ]; then
ckstats $ns3 test4 ns3 5
else
ckstats $ns3 test4 ns3 4
@@ -712,7 +712,7 @@ EOF
echo_i "performance not checked; queryperf not available"
fi
if [ "$DNSRPS_TEST_MODE" = dnsrps ]; then
if [ "$mode" = dnsrps ]; then
echo_i "checking that dnsrpzd is automatically restarted"
OLD_PID=`cat dnsrpzd.pid`
$KILL "$OLD_PID"
@@ -784,7 +784,7 @@ EOF
# dnsrps does not allow NS RRs in policy zones, so this check
# with dnsrps results in no rewriting.
if [ "$DNSRPS_TEST_MODE" = native ]; then
if [ "$mode" = native ]; then
t=`expr $t + 1`
echo_i "checking rpz with delegation fails correctly (${t})"
$DIG -p ${PORT} @$ns3 ns example.com > dig.out.$t
@@ -792,7 +792,7 @@ EOF
fi
[ $status -ne 0 ] && pf=fail || pf=pass
case $DNSRPS_TEST_MODE in
case $mode in
native)
native=$status
echo_i "status (native RPZ sub-test): $status ($pf)";;