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

Merge branch '3352-kasp-test-broken-on-freebsd' into 'main'

Browse Source 
Fix "kasp test broken on freebsd"

Closes #3352

See merge request isc-projects/bind9!6310
This commit is contained in:
Matthijs Mekking 2022-05-16 16:15:01 +00:00
commit edbb52c95c
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,6 +80,10 @@ key_set() {
eval "$(key_key "$1" "$2")='$3'" eval "$(key_key "$1" "$2")='$3'"
} }
key_stat() {
$PERL -e 'print((stat @ARGV[0])[9] . "\n");' "$1"
}
# Save certain values in the KEY array. # Save certain values in the KEY array.
key_save() key_save()
{ {
@ -90,9 +94,9 @@ key_save()
# Save creation date. # Save creation date.
key_set "$1" CREATED "${KEY_CREATED}" key_set "$1" CREATED "${KEY_CREATED}"
# Save key change time. # Save key change time.
key_set "$1" PRIVKEY_STAT $(stat -c '%Z' "${BASE_FILE}.private") key_set "$1" PRIVKEY_STAT $(key_stat "${BASE_FILE}.private")
key_set "$1" PUBKEY_STAT $(stat -c '%Z' "${BASE_FILE}.key") key_set "$1" PUBKEY_STAT $(key_stat "${BASE_FILE}.key")
key_set "$1" STATE_STAT $(stat -c '%Z' "${BASE_FILE}.state") key_set "$1" STATE_STAT $(key_stat "${BASE_FILE}.state")
} }
# Clear key state. # Clear key state.

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

@ -306,9 +306,9 @@ state_stat=$(key_get KEY1 STATE_STAT)
nextpart $DIR/named.run > /dev/null nextpart $DIR/named.run > /dev/null
rndccmd 10.53.0.3 loadkeys "$ZONE" > /dev/null || log_error "rndc loadkeys zone ${ZONE} failed" rndccmd 10.53.0.3 loadkeys "$ZONE" > /dev/null || log_error "rndc loadkeys zone ${ZONE} failed"
wait_for_log 3 "keymgr: $ZONE done" $DIR/named.run wait_for_log 3 "keymgr: $ZONE done" $DIR/named.run
privkey_stat2=$(stat -c '%Z' "${basefile}.private") privkey_stat2=$(key_stat "${basefile}.private")
pubkey_stat2=$(stat -c '%Z' "${basefile}.key") pubkey_stat2=$(key_stat "${basefile}.key")
state_stat2=$(stat -c '%Z' "${basefile}.state") state_stat2=$(key_stat "${basefile}.state")
test "$privkey_stat" = "$privkey_stat2" || log_error "wrong private key file stat (expected $privkey_stat got $privkey_stat2)" test "$privkey_stat" = "$privkey_stat2" || log_error "wrong private key file stat (expected $privkey_stat got $privkey_stat2)"
test "$pubkey_stat" = "$pubkey_stat2" || log_error "wrong public key file stat (expected $pubkey_stat got $pubkey_stat2)" test "$pubkey_stat" = "$pubkey_stat2" || log_error "wrong public key file stat (expected $pubkey_stat got $pubkey_stat2)"
test "$state_stat" = "$state_stat2" || log_error "wrong state file stat (expected $state_stat got $state_stat2)" test "$state_stat" = "$state_stat2" || log_error "wrong state file stat (expected $state_stat got $state_stat2)"
@ -322,9 +322,9 @@ ret=0
nextpart $DIR/named.run > /dev/null nextpart $DIR/named.run > /dev/null
rndccmd 10.53.0.3 loadkeys "$ZONE" > /dev/null || log_error "rndc loadkeys zone ${ZONE} failed" rndccmd 10.53.0.3 loadkeys "$ZONE" > /dev/null || log_error "rndc loadkeys zone ${ZONE} failed"
wait_for_log 3 "keymgr: done" $DIR/named.run wait_for_log 3 "keymgr: done" $DIR/named.run
privkey_stat2=$(stat -c '%Z' "${basefile}.private") privkey_stat2=$(key_stat "${basefile}.private")
pubkey_stat2=$(stat -c '%Z' "${basefile}.key") pubkey_stat2=$(key_stat "${basefile}.key")
state_stat2=$(stat -c '%Z' "${basefile}.state") state_stat2=$(key_stat "${basefile}.state")
test "$privkey_stat" = "$privkey_stat2" || log_error "wrong private key file stat (expected $privkey_stat got $privkey_stat2)" test "$privkey_stat" = "$privkey_stat2" || log_error "wrong private key file stat (expected $privkey_stat got $privkey_stat2)"
test "$pubkey_stat" = "$pubkey_stat2" || log_error "wrong public key file stat (expected $pubkey_stat got $pubkey_stat2)" test "$pubkey_stat" = "$pubkey_stat2" || log_error "wrong public key file stat (expected $pubkey_stat got $pubkey_stat2)"
test "$state_stat" = "$state_stat2" || log_error "wrong state file stat (expected $state_stat got $state_stat2)" test "$state_stat" = "$state_stat2" || log_error "wrong state file stat (expected $state_stat got $state_stat2)"