From: Evan Hunt <each@isc.org>
Date: Fri, 15 May 2020 20:10:36 +0000 (-0700)
Subject: incidental fix: reduce a long timeout in dnstap test
X-Git-Tag: v9.17.2~72^2
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=93d63cd9239aee3aa321d6dbb5726d48b0f07e7a;p=thirdparty%2Fbind9.git

incidental fix: reduce a long timeout in dnstap test

the dnstap test was pausing for 20 seconds to search for a string in
named.run, which only appears if named is built with --enable-developer or
--enable-querytrace.
---

diff --git a/bin/tests/system/dnstap/tests.sh b/bin/tests/system/dnstap/tests.sh
index a666b7e01ff..d8901db657e 100644
--- a/bin/tests/system/dnstap/tests.sh
+++ b/bin/tests/system/dnstap/tests.sh
@@ -44,11 +44,11 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
 # both the 'a.example/A' lookup and the './NS' lookup to ns1
-# need tocomplete before reopening/rolling for the counts to
+# need to complete before reopening/rolling for the counts to
 # be correct.
 
 $DIG $DIGOPTS @10.53.0.3 a.example > dig.out
-wait_for_log 20 "(./NS): query_reset" ns1/named.run || true
+wait_for_log 20 "(.): reset client" ns1/named.run || true
 
 # check three different dnstap reopen/roll methods:
 # ns1: dnstap-reopen; ns2: dnstap -reopen; ns3: dnstap -roll