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

16
bin/tests/system/masterformat/ns1/named.conf.in
View File

@@ -32,51 +32,51 @@ controls {
};
zone "example" {
type master;
type primary;
masterfile-format raw;
file "example.db.raw";
};
zone "compat-example" {
type master;
type primary;
masterfile-format raw;
file "example.db.compat";
};
zone "transfer1" {
type master;
type primary;
file "example.db";
allow-transfer { any; };
};
zone "transfer2" {
type master;
type primary;
file "example.db";
allow-transfer { any; };
};
zone "transfer3" {
type master;
type primary;
file "example.db";
allow-transfer { any; };
};
zone "transfer4" {
type master;
type primary;
file "example.db";
allow-transfer { any; };
};
zone "large" {
type master;
type primary;
file "large.db.raw";
masterfile-format raw;
allow-transfer { any; };
};
zone "signed" {
type master;
type primary;
file "signed.db.map";
masterfile-format map;
allow-transfer { any; };

12
bin/tests/system/masterformat/ns2/named.conf.in
View File

@@ -22,31 +22,31 @@ options {
};
zone "example" {
type master;
type primary;
file "example.db";
};
zone "transfer1" {
type slave;
type secondary;
primaries { 10.53.0.1; };
file "transfer.db.raw";
};
zone "transfer2" {
type slave;
type secondary;
primaries { 10.53.0.1; };
masterfile-format text;
file "transfer.db.txt";
};
zone "transfer3" {
type slave;
type secondary;
primaries { 10.53.0.1; };
file "formerly-text.db";
};
zone "transfer4" {
type slave;
type secondary;
primaries { 10.53.0.1; };
masterfile-format text;
masterfile-style full;
@@ -54,7 +54,7 @@ zone "transfer4" {
};
zone "large" {
type slave;
type secondary;
primaries { 10.53.0.1; };
masterfile-format raw;
file "large.bk";

4
bin/tests/system/masterformat/ns3/named.conf.in
View File

@@ -30,13 +30,13 @@ controls {
};
zone "example" {
type master;
type primary;
masterfile-format map;
file "example.db.map";
};
zone "dynamic" {
type master;
type primary;
masterfile-format map;
file "dynamic.db.map";
allow-update { any; };

10
bin/tests/system/masterformat/tests.sh
View File

@@ -93,7 +93,7 @@ rndccmd() {
status=0
echo_i "checking that master files in raw format loaded ($n)"
echo_i "checking that files in raw format loaded ($n)"
ret=0
set -- 1 2 3
for zone in example example-explicit example-compat; do
@@ -148,14 +148,14 @@ do
sleep 1
done
echo_i "checking that slave was saved in raw format by default ($n)"
echo_i "checking that secondary was saved in raw format by default ($n)"
ret=0
israw ns2/transfer.db.raw || ret=1
n=$((n+1))
[ $ret -eq 0 ] || echo_i "failed"
status=$((status+ret))
echo_i "checking that slave was saved in text format when configured ($n)"
echo_i "checking that secondary was saved in text format when configured ($n)"
ret=0
israw ns2/transfer.db.txt && ret=1
isfull ns2/transfer.db.txt && ret=1
@@ -163,14 +163,14 @@ n=$((n+1))
[ $ret -eq 0 ] || echo_i "failed"
status=$((status+ret))
echo_i "checking that slave was saved in 'full' style when configured ($n)"
echo_i "checking that secondary was saved in 'full' style when configured ($n)"
ret=0
isfull ns2/transfer.db.full > /dev/null 2>&1 || ret=1
n=$((n+1))
[ $ret -eq 0 ] || echo_i "failed"
status=$((status+ret))
echo_i "checking that slave formerly in text format is now raw ($n)"
echo_i "checking that secondary formerly in text format is now raw ($n)"
for i in 0 1 2 3 4 5 6 7 8 9
do
ret=0