From 749df056be9972acb0d6691c63425ba61f9bcb90 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Fri, 23 Feb 2018 10:08:51 -0800 Subject: [PATCH] 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 --- bin/tests/system/dyndb/tests.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/tests/system/dyndb/tests.sh b/bin/tests/system/dyndb/tests.sh index 4fc9a80611..6b10357b89 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"