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

(cherry picked from commit 749df056be9972acb0d6691c63425ba61f9bcb90)

diff --git a/bin/tests/system/dyndb/tests.sh b/bin/tests/system/dyndb/tests.sh
index 9a4850ddf66b19e50f45b380d2b450c190b67d7d..21d85e1865a56455204f1f4880a8faa8188da190 100644 (file)
--- a/bin/tests/system/dyndb/tests.sh
+++ b/bin/tests/system/dyndb/tests.sh
@@ -126,8 +126,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:33" ns1/named.run > /dev/null || ret=1
-grep "loading params for dyndb 'sample2' from .*named.conf:34" 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"