]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Fix the dnstap roll test by:
authorMark Andrews <marka@isc.org>
Fri, 26 Jun 2020 06:08:18 +0000 (16:08 +1000)
committerMark Andrews <marka@isc.org>
Mon, 29 Jun 2020 22:27:58 +0000 (08:27 +1000)
* fixing the find call.
* checking that we rolled a file.

bin/tests/system/dnstap/tests.sh

index 7321cc0b6df5e72763743e0a9c5657b36b18cb16..0ed31056ae8b5eb0c751670e754eda63ea7f6f7d 100644 (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)"