ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Fix kasp system test bugs

Browse Source 
Fix a comment, ensuring the right parameters are used (zone is
parameter $3, not $2) and add view and policy parameters to the comment.

Fix the view tests and test the correct view (example3 instead of
example2).

Fix placement of "n=$((n+1)" for two test cases.
This commit is contained in:
Matthijs Mekking
2022-07-11 10:18:56 +02:00
parent c33c947415
commit ff65f07779
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/tests/system/kasp/tests.sh
View File

@@ -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