Merge branch 'marka-fixup-dnstap-test' into 'main'

Fix the dnstap roll test

See merge request isc-projects/bind9!3756
This commit is contained in:
Mark Andrews 2020-06-29 22:28:46 +00:00
commit 37213cb994

View file

@ -763,8 +763,8 @@ test_dnstap_roll() (
ns="$2"
n="$3"
$RNDCCMD -s "${ip}" dnstap -roll "${n}" | sed "s/^/${ns} /" | cat_i &&
files=$(find . -name "${ns}/dnstap.out.*" | wc -l) &&
test "$files" -le "${n}"
files=$(find "$ns" -name "dnstap.out.[0-9]" | wc -l) &&
test "$files" -le "${n}" && test "$files" -ge "1"
)
echo_i "checking 'rndc -roll <value>' (no versions)"