diff --git a/bin/tests/system/kasp.sh b/bin/tests/system/kasp.sh index 785b69c770..f4058f6400 100644 --- a/bin/tests/system/kasp.sh +++ b/bin/tests/system/kasp.sh @@ -823,9 +823,9 @@ check_keys() { status=$((status+ret)) } -# Call rndc dnssec -status on server $1 for zone $2 and check output. -# This is a loose verification, it just tests if the right policy -# name is returned, and if all expected keys are listed. The rndc +# Call rndc dnssec -status on server $1 for zone $3 in view $4 with policy $2 +# and check output. This is a loose verification, it just tests if the right +# policy name is returned, and if all expected keys are listed. The rndc # dnssec -status output also lists whether a key is published, # used for signing, is retired, or is removed, and if not when # it is scheduled to do so, and it shows the states for the various diff --git a/bin/tests/system/kasp/tests.sh b/bin/tests/system/kasp/tests.sh index 6d63c5d70d..52007245bb 100644 --- a/bin/tests/system/kasp/tests.sh +++ b/bin/tests/system/kasp/tests.sh @@ -1911,12 +1911,12 @@ status=$((status+ret)) TSIG="$DEFAULT_HMAC:keyforview3:$VIEW3" wait_for_nsec check_keys -check_dnssecstatus "$SERVER" "$POLICY" "$ZONE" "example2" +check_dnssecstatus "$SERVER" "$POLICY" "$ZONE" "example3" check_apex dnssec_verify n=$((n+1)) # check subdomain -echo_i "check TXT example.net (in-view example2) rrset is signed correctly ($n)" +echo_i "check TXT example.net (view example3) rrset is signed correctly ($n)" ret=0 dig_with_opts "view.${ZONE}" "@${SERVER}" TXT > "dig.out.$DIR.test$n.txt" || log_error "dig view.${ZONE} TXT failed" grep "status: NOERROR" "dig.out.$DIR.test$n.txt" > /dev/null || log_error "mismatch status in DNS response" @@ -4671,6 +4671,7 @@ _check_soa_ttl() { test ${ttl2:-0} -eq $2 || return 1 } +n=$((n+1)) echo_i "Check that 'rndc reload' of just the serial updates the signed instance ($n)" TSIG= ret=0 @@ -4684,8 +4685,8 @@ wait_for_log 3 "all zones loaded" ns6/named.run retry_quiet 10 _check_soa_ttl 300 300 || ret=1 test "$ret" -eq 0 || echo_i "failed" status=$((status+ret)) -n=$((n+1)) +n=$((n+1)) echo_i "Check that restart with zone changes and deleted journal works ($n)" TSIG= ret=0 @@ -4702,7 +4703,6 @@ wait_for_log 3 "all zones loaded" ns6/named.run retry_quiet 10 _check_soa_ttl 300 400 || ret=1 test "$ret" -eq 0 || echo_i "failed" status=$((status+ret)) -n=$((n+1)) echo_i "exit status: $status" [ $status -eq 0 ] || exit 1