From 2822b01636fa97c2e2cf7ef25e04e81864b0a335 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Thu, 12 Mar 2020 00:28:26 -0700 Subject: [PATCH] incidental fix: dnsrps test was failing the test for logging of invalid prefixes doesn't work when running with dnsrps; disable it in that case. --- bin/tests/system/rpzrecurse/tests.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/bin/tests/system/rpzrecurse/tests.sh b/bin/tests/system/rpzrecurse/tests.sh index ca63987d0f..7b1f206389 100644 --- a/bin/tests/system/rpzrecurse/tests.sh +++ b/bin/tests/system/rpzrecurse/tests.sh @@ -474,15 +474,17 @@ for mode in native dnsrps; do status=1 } - # Check for invalid prefix length error - t=`expr $t + 1` - echo_i "testing for invalid prefix length error (${t})" - add_test_marker 10.53.0.2 - run_server invalidprefixlength - grep "invalid rpz IP address \"1000.4.0.53.10.rpz-client-ip.invalidprefixlength\"; invalid prefix length of 1000$" ns2/named.run > /dev/null || { - echo_ic "failed: expected that invalid prefix length error would be logged" - status=1 - } + if [ "$mode" = "native" ]; then + # Check for invalid prefix length error + t=`expr $t + 1` + echo_i "testing for invalid prefix length error (${t})" + add_test_marker 10.53.0.2 + run_server invalidprefixlength + grep "invalid rpz IP address \"1000.4.0.53.10.rpz-client-ip.invalidprefixlength\"; invalid prefix length of 1000$" ns2/named.run > /dev/null || { + echo_ic "failed: expected that invalid prefix length error would be logged" + status=1 + } + fi t=`expr $t + 1` echo_i "checking 'nsip-wait-recurse no' is faster than 'nsip-wait-recurse yes' ($t)"