mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

Merge branch 'tkrizek-system-test-fixes' into 'main'

Browse Source 
Fix a couple of oversights in system tests

See merge request isc-projects/bind9!8051
This commit is contained in:
Tom Krizek
2023-06-26 11:06:36 +00:00
parent d437b7043a 5f809e50b6
commit 73b09653d4
2 changed files with 13 additions and 3 deletions
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" echo_i "checking unix socket message counts"
sleep 2 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 454 || {
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 kill $fstrm_capture_pid
wait wait
udp4=`$DNSTAPREAD dnstap.out | grep "UDP " | wc -l` udp4=`$DNSTAPREAD dnstap.out | grep "UDP " | wc -l`
@@ -675,7 +680,12 @@ EOF
echo_i "checking reopened unix socket message counts" echo_i "checking reopened unix socket message counts"
sleep 2 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 kill $fstrm_capture_pid
wait wait
udp4=`$DNSTAPREAD dnstap.out | grep "UDP " | wc -l` 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 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: $ZONE done" $DIR/named.run
privkey_stat2=$(key_stat "${basefile}.private") privkey_stat2=$(key_stat "${basefile}.private")
pubkey_stat2=$(key_stat "${basefile}.key") pubkey_stat2=$(key_stat "${basefile}.key")
state_stat2=$(key_stat "${basefile}.state") state_stat2=$(key_stat "${basefile}.state")