mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 08:05:21 +00:00
Code Issues Releases Wiki Activity

runtime test: make the pidfiles match the names of configuration files

Browse Source
This commit is contained in:
Ondřej Surý
2019-11-16 12:55:05 +08:00
parent e9fa7b831b
commit ce86721bc3
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/tests/system/runtime/ns2/named-alt1.conf.in
View File

@@ -14,7 +14,7 @@
options { options {
query-source address 10.53.0.2; query-source address 10.53.0.2;
port @PORT@; port @PORT@;
pid-file "named2.pid"; pid-file "named.pid";
listen-on { 10.53.0.2; }; listen-on { 10.53.0.2; };
listen-on-v6 { fd92:7065:b8e:ffff::2; }; listen-on-v6 { fd92:7065:b8e:ffff::2; };
recursion no; recursion no;

2
bin/tests/system/runtime/ns2/named-alt2.conf.in
View File

@@ -14,7 +14,7 @@
options { options {
query-source address 10.53.0.2; query-source address 10.53.0.2;
port @PORT@; port @PORT@;
pid-file "named3.pid"; pid-file "named.pid";
listen-on { 10.53.0.2; 10.53.0.3; }; listen-on { 10.53.0.2; 10.53.0.3; };
listen-on-v6 { fd92:7065:b8e:ffff::2; }; listen-on-v6 { fd92:7065:b8e:ffff::2; };
recursion no; recursion no;

2
bin/tests/system/runtime/ns2/named-alt3.conf.in
View File

@@ -14,7 +14,7 @@
options { options {
query-source address 10.53.0.2; query-source address 10.53.0.2;
port @PORT@; port @PORT@;
pid-file "named4.pid"; pid-file "named-alt3.pid";
lock-file none; lock-file none;
listen-on { 10.53.0.2; 10.53.0.3; }; listen-on { 10.53.0.2; 10.53.0.3; };
listen-on-v6 { fd92:7065:b8e:ffff::2; }; listen-on-v6 { fd92:7065:b8e:ffff::2; };

2
bin/tests/system/runtime/ns2/named-alt4.conf.in
View File

@@ -12,7 +12,7 @@
options { options {
directory "./nope"; directory "./nope";
port @PORT@; port @PORT@;
pid-file "../named.pid"; pid-file "named.pid";
listen-on { 127.0.0.1; }; listen-on { 127.0.0.1; };
listen-on-v6 { none; }; listen-on-v6 { none; };
recursion no; recursion no;

2
bin/tests/system/runtime/ns2/named-alt5.conf.in
View File

@@ -12,7 +12,7 @@
options { options {
managed-keys-directory "./nope"; managed-keys-directory "./nope";
port @PORT@; port @PORT@;
pid-file "../named.pid"; pid-file "named.pid";
listen-on { 127.0.0.1; }; listen-on { 127.0.0.1; };
listen-on-v6 { none; }; listen-on-v6 { none; };
recursion no; recursion no;

2
bin/tests/system/runtime/ns2/named-alt6.conf.in
View File

@@ -12,7 +12,7 @@
options { options {
new-zones-directory "./nope"; new-zones-directory "./nope";
port @PORT@; port @PORT@;
pid-file "../named.pid"; pid-file "named.pid";
listen-on { 127.0.0.1; }; listen-on { 127.0.0.1; };
listen-on-v6 { none; }; listen-on-v6 { none; };
recursion no; recursion no;

2
bin/tests/system/runtime/ns2/named-alt7.conf.in
View File

@@ -11,7 +11,7 @@
options { options {
port @PORT@; port @PORT@;
pid-file "named7.pid"; pid-file "named.pid";
listen-on { 10.53.0.2; }; listen-on { 10.53.0.2; };
listen-on-v6 { fd92:7065:b8e:ffff::2; }; listen-on-v6 { fd92:7065:b8e:ffff::2; };
}; };

16
bin/tests/system/runtime/tests.sh
View File

@@ -14,9 +14,6 @@ SYSTEMTESTTOP=..
RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s"
status=0
n=0
kill_named() { kill_named() {
pidfile="${1}" pidfile="${1}"
if [ ! -r "${pidfile}" ]; then if [ ! -r "${pidfile}" ]; then
@@ -44,6 +41,9 @@ kill_named() {
return 0 return 0
} }
status=0
n=0
n=`expr $n + 1` n=`expr $n + 1`
echo_i "verifying that named started normally ($n)" echo_i "verifying that named started normally ($n)"
ret=0 ret=0
@@ -59,7 +59,6 @@ ret=0
(cd ns2; $NAMED -c named-alt2.conf -D runtime-ns2-extra-2 -X named.lock -m record,size,mctx -d 99 -g -U 4 >> named3.run 2>&1 & ) (cd ns2; $NAMED -c named-alt2.conf -D runtime-ns2-extra-2 -X named.lock -m record,size,mctx -d 99 -g -U 4 >> named3.run 2>&1 & )
sleep 2 sleep 2
grep "another named process" ns2/named3.run > /dev/null || ret=1 grep "another named process" ns2/named3.run > /dev/null || ret=1
kill_named ns2/named3.pid && ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret` status=`expr $status + $ret`
@@ -69,7 +68,7 @@ ret=0
(cd ns2; $NAMED -c named-alt3.conf -D runtime-ns2-extra-3 -m record,size,mctx -d 99 -g -U 4 >> named4.run 2>&1 & ) (cd ns2; $NAMED -c named-alt3.conf -D runtime-ns2-extra-3 -m record,size,mctx -d 99 -g -U 4 >> named4.run 2>&1 & )
sleep 2 sleep 2
grep "another named process" ns2/named4.run > /dev/null && ret=1 grep "another named process" ns2/named4.run > /dev/null && ret=1
kill_named ns2/named4.pid || ret=1 kill_named ns2/named-alt3.pid || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret` status=`expr $status + $ret`
@@ -103,6 +102,7 @@ $RNDCCMD 10.53.0.2 reconfig > rndc.out.$n 2>&1
grep "failed: permission denied" rndc.out.$n > /dev/null 2>&1 || ret=1 grep "failed: permission denied" rndc.out.$n > /dev/null 2>&1 || ret=1
sleep 1 sleep 1
grep "new-zones-directory './nope' is not writable" ns2/named.run > /dev/null 2>&1 || ret=1 grep "new-zones-directory './nope' is not writable" ns2/named.run > /dev/null 2>&1 || ret=1
kill_named ns2/named.pid || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret` status=`expr $status + $ret`
@@ -140,7 +140,7 @@ cd ns2
$NAMED -c "${SPEC_DIR}/named.conf" -d 99 -g > named6.run 2>&1 & $NAMED -c "${SPEC_DIR}/named.conf" -d 99 -g > named6.run 2>&1 &
sleep 2 sleep 2
grep 'running as.*\\177\\033' named6.run > /dev/null || ret=1 grep 'running as.*\\177\\033' named6.run > /dev/null || ret=1
kill_named named7.pid || ret=1 kill_named named.pid || ret=1
cd .. cd ..
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret` status=`expr $status + $ret`
@@ -155,7 +155,7 @@ cd ns2
$NAMED -c "${SPEC_DIR}/named.conf" -d 99 -g > named7.run 2>&1 & $NAMED -c "${SPEC_DIR}/named.conf" -d 99 -g > named7.run 2>&1 &
sleep 2 sleep 2
grep 'running as.*\\$\\;' named7.run > /dev/null || ret=1 grep 'running as.*\\$\\;' named7.run > /dev/null || ret=1
kill_named named7.pid || ret=1 kill_named named.pid || ret=1
cd .. cd ..
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret` status=`expr $status + $ret`
@@ -168,7 +168,7 @@ cd ns2
$NAMED -c "$SPEC_DIR/named-alt7.conf" -g > named8.run 2>&1 & $NAMED -c "$SPEC_DIR/named-alt7.conf" -g > named8.run 2>&1 &
sleep 2 sleep 2
grep "running as.*\.\.\.$" named8.run > /dev/null || ret=1 grep "running as.*\.\.\.$" named8.run > /dev/null || ret=1
kill_named named7.pid || ret=1 kill_named named.pid || ret=1
cd .. cd ..
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret` status=`expr $status + $ret`