upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'tkrizek-system-test-fixes-9.18' into 'bind-9.18'

Browse source 
[9.18] Fix a couple of oversights in system tests

See merge request isc-projects/bind9!8056
This commit is contained in:
Tom Krizek 2023-06-26 14:27:09 +00:00
commit a0d672f0c5
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bin/tests/system/dnstap/tests.sh
View file

@ -562,7 +562,12 @@ EOF
echo_i "checking unix socket message counts"
sleep 2
retry_quiet 5 dnstap_data_ready $fstrm_capture_pid dnstap.out 470
retry_quiet 5 dnstap_data_ready $fstrm_capture_pid dnstap.out 450 || {
echo_i "dnstap output file smaller than expected"
ret=1
}
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret))
kill $fstrm_capture_pid
wait
udp4=`$DNSTAPREAD dnstap.out | grep "UDP " | wc -l`
@ -675,7 +680,12 @@ EOF
echo_i "checking reopened unix socket message counts"
sleep 2
retry_quiet 5 dnstap_data_ready $fstrm_capture_pid dnstap.out 270
retry_quiet 5 dnstap_data_ready $fstrm_capture_pid dnstap.out 270 || {
echo_i "dnstap output file smaller than expected"
ret=1
}
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret))
kill $fstrm_capture_pid
wait
udp4=`$DNSTAPREAD dnstap.out | grep "UDP " | wc -l`

2
bin/tests/system/kasp/tests.sh
View file

@ -328,7 +328,7 @@ ret=0
nextpart $DIR/named.run > /dev/null
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: $ZONE done" $DIR/named.run
privkey_stat2=$(key_stat "${basefile}.private")
pubkey_stat2=$(key_stat "${basefile}.key")
state_stat2=$(key_stat "${basefile}.state")