From cbf32b901b91b191c47feaf4c5f40f2d3c8ea885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Thu, 8 Aug 2019 14:27:55 +0200 Subject: [PATCH] Use rndc_dumpdb() in the "cookie" system test --- bin/tests/system/cookie/clean.sh | 3 ++- bin/tests/system/cookie/tests.sh | 9 ++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/bin/tests/system/cookie/clean.sh b/bin/tests/system/cookie/clean.sh index b5888d1f5b..3439fc64b2 100644 --- a/bin/tests/system/cookie/clean.sh +++ b/bin/tests/system/cookie/clean.sh @@ -9,7 +9,8 @@ rm -f ns*/named.conf rm -f dig.out.* -rm -f ns1/named_dump.db +rm -f rndc.out.* +rm -f ns1/named_dump.db* rm -f ns*/named.memstats rm -f ns*/named.run rm -f ns*/named.lock diff --git a/bin/tests/system/cookie/tests.sh b/bin/tests/system/cookie/tests.sh index f82bb00546..8e71103942 100755 --- a/bin/tests/system/cookie/tests.sh +++ b/bin/tests/system/cookie/tests.sh @@ -141,13 +141,8 @@ status=`expr $status + $ret` n=`expr $n + 1` echo_i "checking for COOKIE value in adb ($n)" ret=0 -$RNDCCMD 10.53.0.1 dumpdb -for i in 1 2 3 4 5 6 7 8 9 10 -do - sleep 1 - grep "10.53.0.2.*\[cookie=" ns1/named_dump.db > /dev/null && break -done -grep "10.53.0.2.*\[cookie=" ns1/named_dump.db > /dev/null || ret=1 +rndc_dumpdb ns1 +grep "10.53.0.2.*\[cookie=" ns1/named_dump.db.test$n > /dev/null || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret`