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

14
bin/tests/system/unknown/ns1/named.conf.in
View File

@@ -23,32 +23,32 @@ options {
view "in" {
zone "example." {
type master;
type primary;
file "example-in.db";
};
zone "broken1." {
type master;
type primary;
file "broken1.db";
};
zone "broken2." {
type master;
type primary;
file "broken2.db";
};
zone "broken3." {
type master;
type primary;
file "broken3.db";
};
zone "broken4." {
type master;
type primary;
file "broken4.db";
};
zone "broken5." {
type master;
type primary;
file "broken5.db";
};
};
@@ -60,7 +60,7 @@ view "class10" class10 {
};
zone "example." class10 {
type master;
type primary;
file "example-class10.db";
};
};

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

@@ -23,7 +23,7 @@ options {
view "in" {
zone "example." {
type slave;
type secondary;
primaries { 10.53.0.1; };
file "example-in.bk";
};

2
bin/tests/system/unknown/ns3/named.conf.in
View File

@@ -23,7 +23,7 @@ options {
view "in" {
zone "example." {
type slave;
type secondary;
primaries { 10.53.0.1; };
inline-signing yes;
auto-dnssec maintain;

14
bin/tests/system/unknown/tests.sh
View File

@@ -120,7 +120,7 @@ do
status=`expr $status + $ret`
done
echo_i "checking large unknown record loading on master"
echo_i "checking large unknown record loading on primary"
for try in 0 1 2 3 4 5 6 7 8 9; do
ret=0
$DIG $DIGOPTS @10.53.0.1 +tcp +short large.example TYPE45234 > dig.out || { ret=1 ; echo_i "dig failed" ; }
@@ -131,7 +131,7 @@ done
[ $ret = 0 ] || echo_i "failed"
status=`expr $status + $ret`
echo_i "checking large unknown record loading on slave"
echo_i "checking large unknown record loading on secondary"
for try in 0 1 2 3 4 5 6 7 8 9; do
ret=0
$DIG $DIGOPTS @10.53.0.2 +tcp +short large.example TYPE45234 > dig.out || { ret=1 ; echo_i "dig failed" ; }
@@ -142,13 +142,13 @@ done
[ $ret = 0 ] || echo_i "failed"
status=`expr $status + $ret`
echo_i "stop and restart slave"
echo_i "stop and restart secondary"
$PERL $SYSTEMTESTTOP/stop.pl unknown ns2
start_server --noclean --restart --port ${PORT} unknown ns2
# server may be answering queries before zones are loaded,
# so retry a few times if this query fails
echo_i "checking large unknown record loading on slave"
echo_i "checking large unknown record loading on secondary"
for try in 0 1 2 3 4 5 6 7 8 9; do
ret=0
$DIG $DIGOPTS @10.53.0.2 +tcp +short large.example TYPE45234 > dig.out || { ret=1 ; echo_i "dig failed" ; }
@@ -159,20 +159,20 @@ done
[ $ret = 0 ] || echo_i "failed"
status=`expr $status + $ret`
echo_i "checking large unknown record loading on inline slave"
echo_i "checking large unknown record loading on inline secondary"
ret=0
$DIG $DIGOPTS @10.53.0.3 +tcp +short large.example TYPE45234 > dig.out || { ret=1 ; echo_i "dig failed" ; }
$DIFF large.out dig.out > /dev/null || { ret=1 ; echo_i "$DIFF failed"; }
[ $ret = 0 ] || echo_i "failed"
status=`expr $status + $ret`
echo_i "stop and restart inline slave"
echo_i "stop and restart inline secondary"
$PERL $SYSTEMTESTTOP/stop.pl unknown ns3
start_server --noclean --restart --port ${PORT} unknown ns3
# server may be answering queries before zones are loaded,
# so retry a few times if this query fails
echo_i "checking large unknown record loading on inline slave"
echo_i "checking large unknown record loading on inline secondary"
for try in 0 1 2 3 4 5 6 7 8 9; do
ret=0
$DIG $DIGOPTS @10.53.0.3 +tcp +short large.example TYPE45234 > dig.out || { ret=1 ; echo_i "dig failed" ; }