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 749df056be)
This commit is contained in:
Evan Hunt 2018-02-23 10:08:51 -08:00
parent c4ed7c3a41
commit dcd2348c8e

View file

@ -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"