Check for proper file size output in dnstap test

Previously, the first check silently failed, as 450 is apparently (in
the CI setup) the minimum output size for the dnstap output, rather than
470 which the test was expecting. Effectively, the check served as a 5
second sleep rather than waiting for the proper file size.

Additionally, check the expected file sizes and fail if expectations
aren't met.

(manually picked from commit 5f809e50b6)

On main, the minimum file size seems to 454 bytes, while on EL7 in our
CI setup for the 9.18 branch, it appears to be 450 instead.
This commit is contained in:
Tom Krizek 2023-06-22 18:08:17 +02:00
parent d1caa0b4f0
commit ad5006cef4
No known key found for this signature in database
GPG key ID: 01623B9B652A20A7

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`