ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

further tidying of primary/secondary terminology in system tests

Browse Source 
this changes most visble uses of master/slave terminology in tests.sh
and most uses of 'type master' or 'type slave' in named.conf files.
files in the checkconf test were not updated in order to confirm that
the old syntax still works. rpzrecurse was also left mostly unchanged
to avoid interference with DNSRPS.
This commit is contained in:
Evan Hunt
2020-06-30 13:10:59 -07:00
parent 68c384e118
commit e43b3c1fa1
336 changed files with 1478 additions and 1465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/tests/system/rrsetorder/ns1/named.conf.in
View File

@@ -30,7 +30,7 @@ options {
};
zone "." {
type master;
type primary;
file "root.db";
notify explicit;
also-notify { 10.53.0.2; };

2
bin/tests/system/rrsetorder/ns2/named.conf.in
View File

@@ -30,7 +30,7 @@ options {
};
zone "." {
type slave;
type secondary;
primaries { 10.53.0.1; };
file "root.bk";
};

32
bin/tests/system/rrsetorder/tests.sh
View File

@@ -30,7 +30,7 @@ fi
#
#
if $test_fixed; then
echo_i "Checking order fixed (master)"
echo_i "Checking order fixed (primary)"
ret=0
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
do
@@ -40,7 +40,7 @@ if $test_fixed; then
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
else
echo_i "Checking order fixed behaves as cyclic when disabled (master)"
echo_i "Checking order fixed behaves as cyclic when disabled (primary)"
ret=0
matches=0
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
@@ -67,7 +67,7 @@ fi
#
#
#
echo_i "Checking order cyclic (master + additional)"
echo_i "Checking order cyclic (primary + additional)"
ret=0
matches=0
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
@@ -93,7 +93,7 @@ status=`expr $status + $ret`
#
#
#
echo_i "Checking order cyclic (master)"
echo_i "Checking order cyclic (primary)"
ret=0
matches=0
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
@@ -115,7 +115,7 @@ $DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
if [ $matches -ne 16 ]; then ret=1; fi
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i "Checking order random (master)"
echo_i "Checking order random (primary)"
ret=0
for i in $GOOD_RANDOM
do
@@ -146,7 +146,7 @@ status=`expr $status + $ret`
#
#
if $test_fixed; then
echo_i "Checking order fixed (slave)"
echo_i "Checking order fixed (secondary)"
ret=0
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
do
@@ -160,7 +160,7 @@ fi
#
#
#
echo_i "Checking order cyclic (slave + additional)"
echo_i "Checking order cyclic (secondary + additional)"
ret=0
matches=0
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
@@ -186,7 +186,7 @@ status=`expr $status + $ret`
#
#
#
echo_i "Checking order cyclic (slave)"
echo_i "Checking order cyclic (secondary)"
ret=0
matches=0
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
@@ -209,7 +209,7 @@ if [ $matches -ne 16 ]; then ret=1; fi
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i "Checking order random (slave)"
echo_i "Checking order random (secondary)"
ret=0
for i in $GOOD_RANDOM
do
@@ -236,11 +236,11 @@ if [ $match -lt `expr ${GOOD_RANDOM_NO} / 3` ]; then ret=1; fi
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i "Shutting down slave"
echo_i "Shutting down secondary"
(cd ..; $SHELL stop.sh rrsetorder ns2 )
echo_i "Checking for slave's on disk copy of zone"
echo_i "Checking for secondary's on disk copy of zone"
if [ ! -f ns2/root.bk ]
then
@@ -248,7 +248,7 @@ then
status=`expr $status + 1`
fi
echo_i "Re-starting slave"
echo_i "Re-starting secondary"
start_server --noclean --port ${PORT} rrsetorder ns2
@@ -256,7 +256,7 @@ start_server --noclean --port ${PORT} rrsetorder ns2
#
#
if $test_fixed; then
echo_i "Checking order fixed (slave loaded from disk)"
echo_i "Checking order fixed (secondary loaded from disk)"
ret=0
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
do
@@ -270,7 +270,7 @@ fi
#
#
#
echo_i "Checking order cyclic (slave + additional, loaded from disk)"
echo_i "Checking order cyclic (secondary + additional, loaded from disk)"
ret=0
matches=0
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
@@ -296,7 +296,7 @@ status=`expr $status + $ret`
#
#
#
echo_i "Checking order cyclic (slave loaded from disk)"
echo_i "Checking order cyclic (secondary loaded from disk)"
ret=0
matches=0
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
@@ -319,7 +319,7 @@ if [ $matches -ne 16 ]; then ret=1; fi
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i "Checking order random (slave loaded from disk)"
echo_i "Checking order random (secondary loaded from disk)"
ret=0
for i in $GOOD_RANDOM
do