From: Mark Andrews <marka@isc.org>
Date: Fri, 26 Jun 2020 06:08:18 +0000 (+1000)
Subject: Fix the dnstap roll test by:
X-Git-Tag: v9.17.3~28^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3215125eadd0f01a9c482048dd604207e824cd2;p=thirdparty%2Fbind9.git

Fix the dnstap roll test by:

* fixing the find call.
* checking that we rolled a file.
---

diff --git a/bin/tests/system/dnstap/tests.sh b/bin/tests/system/dnstap/tests.sh
index 7321cc0b6df..0ed31056ae8 100644
--- a/bin/tests/system/dnstap/tests.sh
+++ b/bin/tests/system/dnstap/tests.sh
@@ -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)"