From: Tom Krizek Date: Thu, 22 Jun 2023 16:08:17 +0000 (+0200) Subject: Check for proper file size output in dnstap test X-Git-Tag: v9.19.15~19^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5f809e50b6a8441592fdf6d0fd8aa69668a25439;p=thirdparty%2Fbind9.git Check for proper file size output in dnstap test Previously, the first check silently failed, as 454 is apparently (in my local 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. --- diff --git a/bin/tests/system/dnstap/tests.sh b/bin/tests/system/dnstap/tests.sh index 9e28c956895..5936657d5a3 100644 --- a/bin/tests/system/dnstap/tests.sh +++ b/bin/tests/system/dnstap/tests.sh @@ -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 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 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`