From 730c6651a0f01e82325cdedfba770475d77b2fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Tue, 26 Jun 2018 12:19:41 +0200 Subject: [PATCH] Determine "rpz" system test mode based on $mode rather than $DNSRPS_TEST_MODE 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. --- bin/tests/system/rpz/tests.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/tests/system/rpz/tests.sh b/bin/tests/system/rpz/tests.sh index c7d9de8d3a..a55b1bb1fe 100644 --- a/bin/tests/system/rpz/tests.sh +++ b/bin/tests/system/rpz/tests.sh @@ -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)";;