From 4e597364a67c51212355a092114cdd5f810f807b Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Wed, 23 Jan 2019 22:08:43 -0800 Subject: [PATCH] fix legacy test use rndc rather than signals to stop the server --- bin/tests/system/legacy/ns1/named1.conf.in | 9 +++++++++ bin/tests/system/legacy/tests.sh | 4 +--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bin/tests/system/legacy/ns1/named1.conf.in b/bin/tests/system/legacy/ns1/named1.conf.in index c5833a41c6..61e842a9bb 100644 --- a/bin/tests/system/legacy/ns1/named1.conf.in +++ b/bin/tests/system/legacy/ns1/named1.conf.in @@ -20,6 +20,15 @@ options { recursion yes; }; +key rndc_key { + secret "1234abcd8765"; + algorithm hmac-sha256; +}; + +controls { + inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; +}; + zone "." { type master; file "root.db"; diff --git a/bin/tests/system/legacy/tests.sh b/bin/tests/system/legacy/tests.sh index 9e39c4f525..ea12ca0467 100755 --- a/bin/tests/system/legacy/tests.sh +++ b/bin/tests/system/legacy/tests.sh @@ -144,10 +144,8 @@ status=`expr $status + $ret` if $SHELL ../testcrypto.sh > /dev/null 2>&1 then - $PERL $SYSTEMTESTTOP/stop.pl legacy ns1 - + $PERL $SYSTEMTESTTOP/stop.pl --use-rndc --port ${CONTROLPORT} legacy ns1 copy_setports ns1/named2.conf.in ns1/named.conf - $PERL $SYSTEMTESTTOP/start.pl --noclean --restart --port ${PORT} legacy ns1 n=`expr $n + 1`