From: Michał Kępień <michal@isc.org>
Date: Thu, 8 Aug 2019 12:27:55 +0000 (+0200)
Subject: Use rndc_dumpdb() in the "rndc" system test
X-Git-Tag: v9.15.3~5^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=443449863b13bc4d757927e4e5244e417029be6c;p=thirdparty%2Fbind9.git

Use rndc_dumpdb() in the "rndc" system test
---

diff --git a/bin/tests/system/rndc/clean.sh b/bin/tests/system/rndc/clean.sh
index 3472273c271..ddab2df8fe6 100644
--- a/bin/tests/system/rndc/clean.sh
+++ b/bin/tests/system/rndc/clean.sh
@@ -16,7 +16,7 @@ rm -f ns*/named.run ns*/named.run.prev
 rm -f ns2/named.stats
 rm -f ns2/nil.db ns2/other.db ns2/static.db ns2/*.jnl
 rm -f ns2/session.key
-rm -f ns3/named_dump.db
+rm -f ns3/named_dump.db*
 rm -f ns4/*.nta
 rm -f ns4/key?.conf
 rm -f ns6/huge.zone.db
diff --git a/bin/tests/system/rndc/tests.sh b/bin/tests/system/rndc/tests.sh
index 3718e143182..2af855aa282 100644
--- a/bin/tests/system/rndc/tests.sh
+++ b/bin/tests/system/rndc/tests.sh
@@ -314,15 +314,7 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 echo_i "test 'rndc dumpdb' on a empty cache ($n)"
 ret=0
-$RNDCCMD 10.53.0.3 dumpdb > /dev/null || ret=1
-for i in 1 2 3 4 5 6 7 8 9
-do
-	tmp=0
-	grep "Dump complete" ns3/named_dump.db > /dev/null || tmp=1
-	[ $tmp -eq 0 ] && break
-	sleep 1
-done
-[ $tmp -eq 1 ] && ret=1
+rndc_dumpdb ns3 || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`