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

Merge branch '2195-freebsd-dnstap-system-test-failure-v9_11' into 'v9_11'

Browse Source 
Fix dnstap system test on FreeBSD

See merge request isc-projects/bind9!4276
This commit is contained in:
Diego dos Santos Fronza
2020-10-20 14:32:48 +00:00
parent f7a271d562 0cd414a390
commit e79c001356
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bin/tests/system/dnstap/tests.sh
View File

@@ -17,6 +17,24 @@ RNDCCMD="$RNDC -p ${CONTROLPORT} -c ../common/rndc.conf"
status=0
# dnstap_data_ready <fstrm_capture_PID> <capture_file> <min_file_size>
# Flushes capture_file and checks wheter its size is >= min_file_size.
dnstap_data_ready() {
# Process id of running fstrm_capture.
fstrm_capture_pid=$1
# Output file provided to fstrm_capture via -w switch.
capture_file=$2
# Minimum expected file size.
min_size_expected=$3
kill -HUP $fstrm_capture_pid
file_size=`wc -c < "$capture_file" | tr -d ' '`
if [ $file_size -lt $min_size_expected ]; then
return 1
fi
}
for bad in bad-*.conf
do
ret=0
@@ -431,6 +449,7 @@ if [ -n "$FSTRM_CAPTURE" ] ; then
echo_i "checking unix socket message counts"
sleep 2
retry_quiet 5 dnstap_data_ready $fstrm_capture_pid dnstap.out 470
kill $fstrm_capture_pid
wait
udp4=`$DNSTAPREAD dnstap.out | grep "UDP " | wc -l`
@@ -520,6 +539,7 @@ if [ -n "$FSTRM_CAPTURE" ] ; then
echo_i "checking reopened unix socket message counts"
sleep 2
retry_quiet 5 dnstap_data_ready $fstrm_capture_pid dnstap.out 270
kill $fstrm_capture_pid
wait
udp4=`$DNSTAPREAD dnstap.out | grep "UDP " | wc -l`