From: Evan Hunt <each@isc.org>
Date: Fri, 23 Feb 2018 18:08:51 +0000 (-0800)
Subject: improve dyndb test resilience
X-Git-Tag: v9.13.0~144^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=749df056be9972acb0d6691c63425ba61f9bcb90;p=thirdparty%2Fbind9.git

improve dyndb test resilience

- no longer grep for specific line numbers when checking
  parameter logging, as those can change
- report the failure immediatey if parameter check fails
---

diff --git a/bin/tests/system/dyndb/tests.sh b/bin/tests/system/dyndb/tests.sh
index 4fc9a80611d..6b10357b890 100644
--- a/bin/tests/system/dyndb/tests.sh
+++ b/bin/tests/system/dyndb/tests.sh
@@ -129,8 +129,9 @@ test_del test4.ipv6.example.nil. AAAA || ret=1
 status=`expr $status + $ret`
 
 newtest "checking parameter logging"
-grep "loading params for dyndb 'sample' from .*named.conf:36" ns1/named.run > /dev/null || ret=1
-grep "loading params for dyndb 'sample2' from .*named.conf:37" ns1/named.run > /dev/null || ret=1
+grep "loading params for dyndb 'sample' from .*named.conf:" ns1/named.run > /dev/null || ret=1
+grep "loading params for dyndb 'sample2' from .*named.conf:" ns1/named.run > /dev/null || ret=1
+[ $ret -eq 1 ] && echo_i "failed"
 status=`expr $status + $ret`
 
 echo_i "checking dyndb still works after reload"