From: Evan Hunt <each@isc.org>
Date: Wed, 23 Jan 2019 05:48:59 +0000 (-0800)
Subject: fix masterformat test
X-Git-Tag: v9.13.6~36^2~12
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=10aba2cbbb334c2d8924fc60579eb7928b6816a6;p=thirdparty%2Fbind9.git

fix masterformat test

use stop.pl instead of rndc to stop server
---

diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh
index 0f74b174089..29120195179 100755
--- a/bin/tests/system/masterformat/tests.sh
+++ b/bin/tests/system/masterformat/tests.sh
@@ -235,7 +235,7 @@ grep "added text" "dig.out.dynamic1.ns3.test$n" > /dev/null 2>&1 || ret=1
 dig_with_opts +comm @10.53.0.3 added.dynamic txt > "dig.out.dynamic2.ns3.test$n"
 grep "NXDOMAIN" "dig.out.dynamic2.ns3.test$n" > /dev/null 2>&1 || ret=1
 # using "rndc halt" ensures that we don't dump the zone file
-rndccmd 10.53.0.3 halt 2>&1 | sed 's/^/ns3 /' | cat_i
+$PERL $SYSTEMTESTTOP/stop.pl --use-rndc --halt --port ${CONTROLPORT} rndc ns3
 restart
 for i in 0 1 2 3 4 5 6 7 8 9; do
     lret=0
@@ -261,7 +261,7 @@ END
 dig_with_opts @10.53.0.3 moretext.dynamic txt > "dig.out.dynamic1.ns3.test$n"
 grep "more text" "dig.out.dynamic1.ns3.test$n" > /dev/null 2>&1 || ret=1
 # using "rndc stop" will cause the zone file to flush before shutdown
-rndccmd 10.53.0.3 stop 2>&1 | sed 's/^/ns3 /' | cat_i
+$PERL $SYSTEMTESTTOP/stop.pl --use-rndc --port ${CONTROLPORT} rndc ns3
 rm ns3/*.jnl
 restart
 #shellcheck disable=SC2034