upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 10:59:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'tkrizek/pytest-check-system-test-files-with-danger-9.18' into 'bind-9.18'

Browse source 
[9.18] enforce system test file and name conventions with danger CI

See merge request isc-projects/bind9!8311
This commit is contained in:
Tom Krizek 2023-09-19 13:40:50 +00:00
commit 7509613408
251 changed files with 335 additions and 286 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/tests/system/.gitignore vendored
View file

@ -29,3 +29,4 @@ parallel.mk
/*_*
!/*_*.py
!/*_*.sh
!/_common

2
bin/tests/system/Makefile.am
View file

@ -255,4 +255,4 @@ $(TESTS): legacy.run.sh
test-local: check
clean-local::
-find $(builddir) -maxdepth 1 -type d -name "*_*" | xargs rm -rf
-find -L . -mindepth 1 -maxdepth 1 -type d -name "*_*" -and -not -name "_common" -exec rm -rf {} \;

10
bin/tests/system/README
View file

@ -14,10 +14,9 @@ Introduction
This directory holds a simple test environment for running bind9 system tests
involving multiple name servers.
With the exception of "common" (which holds configuration information common to
multiple tests), each directory holds a set of scripts and configuration
files to test different parts of BIND. The directories are named for the
aspect of BIND they test, for example:
Each system test directory holds a set of scripts and configuration files to
test different parts of BIND. The directories are named for the aspect of BIND
they test, for example:
dnssec/ DNSSEC tests
forward/ Forwarding tests
@ -25,6 +24,9 @@ aspect of BIND they test, for example:
etc.
A system test directory must start with an alphabetic character and may not
contain any special characters. Only hyphen may be used as a word separator.
Typically each set of tests sets up 2-5 name servers and then performs one or
more tests against them. Within the test subdirectory, each name server has a
separate subdirectory containing its configuration data. These subdirectories

0
bin/tests/system/common/controls.conf.in → bin/tests/system/_common/controls.conf.in
View file

0
bin/tests/system/common/rndc.conf → bin/tests/system/_common/rndc.conf
View file

0
bin/tests/system/common/rndc.key → bin/tests/system/_common/rndc.key
View file

0
bin/tests/system/common/root.hint → bin/tests/system/_common/root.hint
View file

2
bin/tests/system/acl/ns2/named1.conf.in
View file

@ -47,7 +47,7 @@ key two {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "example" {

2
bin/tests/system/acl/ns2/named2.conf.in
View file

@ -47,7 +47,7 @@ key two {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "example" {

2
bin/tests/system/acl/ns2/named3.conf.in
View file

@ -60,7 +60,7 @@ acl accept {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "example" {

2
bin/tests/system/acl/ns2/named4.conf.in
View file

@ -59,7 +59,7 @@ acl check2 { !key two; 10.53.0.2; };
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "example" {

2
bin/tests/system/acl/ns2/named5.conf.in
View file

@ -49,7 +49,7 @@ key two {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "example" {

2
bin/tests/system/acl/tests.sh
View file

@ -16,7 +16,7 @@ set -e
. ../conf.sh
DIGOPTS="+tcp +noadd +nosea +nostat +noquest +nocomm +nocmd -p ${PORT}"
RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
status=0
t=0

2
bin/tests/system/additional/ns1/named1.conf.in
View file

@ -25,7 +25,7 @@ options {
minimal-responses yes;
};
include "../../common/rndc.key";
include "../../_common/rndc.key";
controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

2
bin/tests/system/additional/ns1/named2.conf.in
View file

@ -25,7 +25,7 @@ options {
minimal-responses no;
};
include "../../common/rndc.key";
include "../../_common/rndc.key";
controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

2
bin/tests/system/additional/ns1/named3.conf.in
View file

@ -26,7 +26,7 @@ options {
minimal-responses no-auth;
};
include "../../common/rndc.key";
include "../../_common/rndc.key";
controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

2
bin/tests/system/additional/ns1/named4.conf.in
View file

@ -25,7 +25,7 @@ options {
minimal-responses no-auth-recursive;
};
include "../../common/rndc.key";
include "../../_common/rndc.key";
controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

2
bin/tests/system/additional/tests.sh
View file

@ -16,7 +16,7 @@ set -e
. ../conf.sh
DIGOPTS="-p ${PORT}"
RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
status=0
n=0

2
bin/tests/system/addzone/ns1/named.conf.in
View file

@ -33,7 +33,7 @@ options {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "inlinesec.example" {

4
bin/tests/system/addzone/ns2/named1.conf.in
View file

@ -22,7 +22,7 @@ options {
dnssec-validation no;
};
include "../../common/rndc.key";
include "../../_common/rndc.key";
controls {
inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
@ -30,7 +30,7 @@ controls {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

6
bin/tests/system/addzone/ns2/named2.conf.in
View file

@ -11,7 +11,7 @@
* information regarding copyright ownership.
*/
include "../../common/rndc.key";
include "../../_common/rndc.key";
controls {
inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
@ -36,7 +36,7 @@ view internal {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "policy" {
@ -51,7 +51,7 @@ view external {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
};

8
bin/tests/system/addzone/ns2/named3.conf.in
View file

@ -11,7 +11,7 @@
* information regarding copyright ownership.
*/
include "../../common/rndc.key";
include "../../_common/rndc.key";
controls {
inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
@ -36,7 +36,7 @@ view internal {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "policy" {
@ -51,7 +51,7 @@ view directory {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
};
@ -61,7 +61,7 @@ view external {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
};

2
bin/tests/system/addzone/ns3/named1.conf.in
View file

@ -11,7 +11,7 @@
* information regarding copyright ownership.
*/
include "../../common/rndc.key";
include "../../_common/rndc.key";
controls {
inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

2
bin/tests/system/addzone/ns3/named2.conf.in
View file

@ -11,7 +11,7 @@
* information regarding copyright ownership.
*/
include "../../common/rndc.key";
include "../../_common/rndc.key";
controls {
inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

2
bin/tests/system/addzone/tests.sh
View file

@ -16,7 +16,7 @@ set -e
. ../conf.sh
DIGOPTS="+tcp +nosea +nostat +nocmd +norec +noques +noauth +noadd +nostats +dnssec -p ${PORT}"
RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
check_zonestatus() (
$RNDCCMD "10.53.0.$1" zonestatus -redirect > "zonestatus.out.ns$1.$n" &&

2
bin/tests/system/addzone/tests_rndc_deadlock.py
View file

@ -22,7 +22,7 @@ def run_rndc(server, rndc_command):
rndc = os.getenv("RNDC")
port = os.getenv("CONTROLPORT")
cmdline = [rndc, "-c", "../common/rndc.conf", "-p", port, "-s", server]
cmdline = [rndc, "-c", "../_common/rndc.conf", "-p", port, "-s", server]
cmdline.extend(rndc_command)
subprocess.check_output(cmdline, stderr=subprocess.STDOUT, timeout=10)

2
bin/tests/system/allow-query/ns2/named01.conf.in
View file

@ -24,7 +24,7 @@ include "controls.conf";
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named02.conf.in
View file

@ -25,7 +25,7 @@ include "controls.conf";
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named03.conf.in
View file

@ -25,7 +25,7 @@ include "controls.conf";
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named04.conf.in
View file

@ -25,7 +25,7 @@ include "controls.conf";
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named05.conf.in
View file

@ -25,7 +25,7 @@ include "controls.conf";
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named06.conf.in
View file

@ -25,7 +25,7 @@ include "controls.conf";
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named07.conf.in
View file

@ -27,7 +27,7 @@ include "controls.conf";
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named08.conf.in
View file

@ -27,7 +27,7 @@ include "controls.conf";
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named09.conf.in
View file

@ -27,7 +27,7 @@ include "controls.conf";
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named10.conf.in
View file

@ -30,7 +30,7 @@ include "controls.conf";
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named11.conf.in
View file

@ -36,7 +36,7 @@ include "controls.conf";
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named12.conf.in
View file

@ -30,7 +30,7 @@ include "controls.conf";
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named21.conf.in
View file

@ -26,7 +26,7 @@ view "internal" {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named22.conf.in
View file

@ -28,7 +28,7 @@ view "internal" {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named23.conf.in
View file

@ -28,7 +28,7 @@ view "internal" {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named24.conf.in
View file

@ -28,7 +28,7 @@ view "internal" {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named25.conf.in
View file

@ -28,7 +28,7 @@ view "internal" {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named26.conf.in
View file

@ -28,7 +28,7 @@ view "internal" {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named27.conf.in
View file

@ -30,7 +30,7 @@ view "internal" {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named28.conf.in
View file

@ -30,7 +30,7 @@ view "internal" {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named29.conf.in
View file

@ -30,7 +30,7 @@ view "internal" {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named30.conf.in
View file

@ -33,7 +33,7 @@ view "internal" {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named31.conf.in
View file

@ -40,7 +40,7 @@ view "internal" {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named32.conf.in
View file

@ -33,7 +33,7 @@ view "internal" {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named33.conf.in
View file

@ -29,7 +29,7 @@ view "internal" {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named34.conf.in
View file

@ -29,7 +29,7 @@ view "internal" {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named40.conf.in
View file

@ -38,7 +38,7 @@ include "controls.conf";
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named53.conf.in
View file

@ -25,7 +25,7 @@ include "controls.conf";
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named54.conf.in
View file

@ -25,7 +25,7 @@ include "controls.conf";
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named55.conf.in
View file

@ -28,7 +28,7 @@ view "internal" {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named56.conf.in
View file

@ -28,7 +28,7 @@ view "internal" {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns2/named57.conf.in
View file

@ -27,7 +27,7 @@ view "internal" {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "normal.example" {

2
bin/tests/system/allow-query/ns3/named1.conf.in
View file

@ -31,5 +31,5 @@ controls {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};

2
bin/tests/system/allow-query/ns3/named2.conf.in
View file

@ -34,5 +34,5 @@ controls {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};

2
bin/tests/system/allow-query/ns3/named3.conf.in
View file

@ -34,5 +34,5 @@ controls {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};

2
bin/tests/system/allow-query/ns3/named4.conf.in
View file

@ -34,5 +34,5 @@ controls {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};

2
bin/tests/system/allow-query/setup.sh
View file

@ -13,7 +13,7 @@
. ../conf.sh
copy_setports ../common/controls.conf.in ns2/controls.conf
copy_setports ../_common/controls.conf.in ns2/controls.conf
copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named01.conf.in ns2/named.conf
copy_setports ns3/named1.conf.in ns3/named.conf

2
bin/tests/system/allow-query/tests_sh_allowquery.py → bin/tests/system/allow-query/tests_sh_allow_query.py
View file

@ -10,5 +10,5 @@
# information regarding copyright ownership.
def test_allowquery(run_tests_sh):
def test_allow_query(run_tests_sh):
run_tests_sh()

2
bin/tests/system/autosign/ns2/named.conf.in
View file

@ -38,7 +38,7 @@ controls {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "example" {

2
bin/tests/system/autosign/ns3/named.conf.in
View file

@ -42,7 +42,7 @@ controls {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "example" {

2
bin/tests/system/autosign/ns4/named.conf.in
View file

@ -28,7 +28,7 @@ options {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
include "trusted.conf";

2
bin/tests/system/autosign/ns5/named.conf.in
View file

@ -27,7 +27,7 @@ options {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
include "trusted.conf";

2
bin/tests/system/autosign/tests.sh
View file

@ -19,7 +19,7 @@ status=0
n=0
DIGOPTS="+tcp +noadd +nosea +nostat +nocmd +dnssec -p ${PORT}"
RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
# convert private-type records to readable form
# $1 is the zone

2
bin/tests/system/builtin/ns1/named.conf.in
View file

@ -11,7 +11,7 @@
* information regarding copyright ownership.
*/
include "../../common/rndc.key";
include "../../_common/rndc.key";
controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

2
bin/tests/system/builtin/ns2/named.conf.in
View file

@ -11,7 +11,7 @@
* information regarding copyright ownership.
*/
include "../../common/rndc.key";
include "../../_common/rndc.key";
controls {
inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

2
bin/tests/system/builtin/ns3/named.conf.in
View file

@ -11,7 +11,7 @@
* information regarding copyright ownership.
*/
include "../../common/rndc.key";
include "../../_common/rndc.key";
controls {
inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

2
bin/tests/system/builtin/tests.sh
View file

@ -16,7 +16,7 @@ set -e
. ../conf.sh
DIGOPTS="-p ${PORT}"
RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
status=0
n=0

2
bin/tests/system/cacheclean/ns2/named.conf.in
View file

@ -36,7 +36,7 @@ controls {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "flushtest.example" {

2
bin/tests/system/cacheclean/tests.sh
View file

@ -18,7 +18,7 @@ set -e
status=0
n=0
RNDCOPTS="-c ../common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT}"
RNDCOPTS="-c ../_common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT}"
DIGOPTS="+nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm \
+nostat @10.53.0.2 -p ${PORT}"

2
bin/tests/system/catz/ns1/named.conf.in
View file

@ -11,7 +11,7 @@
* information regarding copyright ownership.
*/
include "../../common/rndc.key";
include "../../_common/rndc.key";
controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

2
bin/tests/system/catz/ns2/named1.conf.in
View file

@ -11,7 +11,7 @@
* information regarding copyright ownership.
*/
include "../../common/rndc.key";
include "../../_common/rndc.key";
controls {
inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

2
bin/tests/system/catz/ns2/named2.conf.in
View file

@ -11,7 +11,7 @@
* information regarding copyright ownership.
*/
include "../../common/rndc.key";
include "../../_common/rndc.key";
controls {
inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

2
bin/tests/system/catz/ns3/named.conf.in
View file

@ -11,7 +11,7 @@
* information regarding copyright ownership.
*/
include "../../common/rndc.key";
include "../../_common/rndc.key";
controls {
inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

2
bin/tests/system/catz/ns4/named.conf.in
View file

@ -11,7 +11,7 @@
* information regarding copyright ownership.
*/
include "../../common/rndc.key";
include "../../_common/rndc.key";
controls {
inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

8
bin/tests/system/catz/tests.sh
View file

@ -21,7 +21,7 @@ dig_with_opts() {
}
rndccmd() (
"$RNDC" -c ../common/rndc.conf -p "${CONTROLPORT}" -s "$@"
"$RNDC" -c ../_common/rndc.conf -p "${CONTROLPORT}" -s "$@"
)
_wait_for_message() (
@ -662,7 +662,7 @@ echo_i "reconfiguring secondary - checking if catz survives a certain class of f
ret=0
sed -e "s/^#T3//" < ns2/named1.conf.in > ns2/named.conf.tmp
copy_setports ns2/named.conf.tmp ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p "${CONTROLPORT}" reconfig > /dev/null 2>&1 && ret=1
$RNDC -c ../_common/rndc.conf -s 10.53.0.2 -p "${CONTROLPORT}" reconfig > /dev/null 2>&1 && ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
@ -689,7 +689,7 @@ echo_i "reconfiguring secondary - checking if catz survives another type of fail
ret=0
sed -e "s/^#T4//" < ns2/named1.conf.in > ns2/named.conf.tmp
copy_setports ns2/named.conf.tmp ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p "${CONTROLPORT}" reconfig > /dev/null 2>&1 && ret=1
$RNDC -c ../_common/rndc.conf -s 10.53.0.2 -p "${CONTROLPORT}" reconfig > /dev/null 2>&1 && ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
@ -1746,7 +1746,7 @@ echo_i "reconfiguring secondary - removing catalog4 catalog zone, adding non-exi
ret=0
sed -e "s/^#T2//" < ns2/named1.conf.in > ns2/named.conf.tmp
copy_setports ns2/named.conf.tmp ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p "${CONTROLPORT}" reconfig > /dev/null 2>&1 && ret=1
$RNDC -c ../_common/rndc.conf -s 10.53.0.2 -p "${CONTROLPORT}" reconfig > /dev/null 2>&1 && ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))

2
bin/tests/system/chain/ns5/named.conf.in
View file

@ -28,7 +28,7 @@ options {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "sub5.example" {

2
bin/tests/system/chain/tests.sh
View file

@ -16,7 +16,7 @@ set -e
. ../conf.sh
DIGOPTS="-p ${PORT}"
RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
sendcmd() {
send 10.53.0.4 "${EXTRAPORT1}"

2
bin/tests/system/checkds/ns2/named.conf.in
View file

@ -37,7 +37,7 @@ controls {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "checkds" {

2
bin/tests/system/checkds/ns3/named.conf.in
View file

@ -35,7 +35,7 @@ controls {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
include "trusted.conf";

2
bin/tests/system/checkds/ns5/named.conf.in
View file

@ -37,7 +37,7 @@ controls {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "checkds" {

2
bin/tests/system/checkds/ns6/named.conf.in
View file

@ -37,7 +37,7 @@ controls {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "foo" {

2
bin/tests/system/checkds/ns7/named.conf.in
View file

@ -37,7 +37,7 @@ controls {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "checkds" {

2
bin/tests/system/checkds/ns9/named.conf.in
View file

@ -41,7 +41,7 @@ parental-agents "ns2" port @PORT@ {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
/*

14
bin/tests/system/conf.sh.common
View file

@ -296,7 +296,7 @@ send() {
eval "$($PYTHON "$TOP_SRCDIR/bin/tests/system/get_algorithms.py")"
# Default HMAC algorithm.
# also update common/rndc.conf and common/rndc.key when updating DEFAULT_HMAC
# also update _common/rndc.conf and _common/rndc.key when updating DEFAULT_HMAC
export DEFAULT_HMAC=hmac-sha256
#
@ -609,12 +609,12 @@ _times() {
}
rndc_reload() {
$RNDC -c ../common/rndc.conf -s $2 -p ${CONTROLPORT} reload $3 2>&1 | sed 's/^/'"I:$SYSTESTDIR:$1"' /'
$RNDC -c ../_common/rndc.conf -s $2 -p ${CONTROLPORT} reload $3 2>&1 | sed 's/^/'"I:$SYSTESTDIR:$1"' /'
# reloading single zone is synchronous, if we're reloading whole server
# we need to wait for reload to finish
if [ -z "$3" ]; then
for _ in $(_times 10); do
$RNDC -c ../common/rndc.conf -s $2 -p ${CONTROLPORT} status | grep "reload/reconfig in progress" > /dev/null || break
$RNDC -c ../_common/rndc.conf -s $2 -p ${CONTROLPORT} status | grep "reload/reconfig in progress" > /dev/null || break
sleep 1
done
fi
@ -622,9 +622,9 @@ rndc_reload() {
rndc_reconfig() {
seconds=${3:-10}
$RNDC -c ../common/rndc.conf -s "$2" -p "${CONTROLPORT}" reconfig 2>&1 | sed 's/^/'"I:$SYSTESTDIR:$1"' /'
$RNDC -c ../_common/rndc.conf -s "$2" -p "${CONTROLPORT}" reconfig 2>&1 | sed 's/^/'"I:$SYSTESTDIR:$1"' /'
for _ in $(_times "$seconds"); do
"$RNDC" -c ../common/rndc.conf -s "$2" -p "${CONTROLPORT}" status | grep "reload/reconfig in progress" > /dev/null || break
"$RNDC" -c ../_common/rndc.conf -s "$2" -p "${CONTROLPORT}" status | grep "reload/reconfig in progress" > /dev/null || break
sleep 1
done
}
@ -636,7 +636,7 @@ rndc_reconfig() {
# arguments, if any, are appended to the rndc command line after "dumpdb".
#
# Control channel configuration for the name server instance to send the
# command to must match the contents of bin/tests/system/common/rndc.conf.
# command to must match the contents of bin/tests/system/_common/rndc.conf.
#
# rndc output is stored in a file called rndc.out.test${n}; the "n" variable is
# required to be set by the calling tests.sh script.
@ -651,7 +651,7 @@ rndc_dumpdb() {
__ip="10.53.0.$(echo "${__server}" | tr -c -d "0-9")"
shift
${RNDC} -c ../common/rndc.conf -p "${CONTROLPORT}" -s "${__ip}" dumpdb "$@" > "rndc.out.test${n}" 2>&1 || __ret=1
${RNDC} -c ../_common/rndc.conf -p "${CONTROLPORT}" -s "${__ip}" dumpdb "$@" > "rndc.out.test${n}" 2>&1 || __ret=1
for _ in 0 1 2 3 4 5 6 7 8 9
do

2
bin/tests/system/cookie/tests.sh
View file

@ -16,7 +16,7 @@ set -e
. ../conf.sh
DIGOPTS="-p ${PORT}"
RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
status=0
n=0

2
bin/tests/system/database/tests.sh
View file

@ -21,7 +21,7 @@ n=0
rm -f dig.out.*
DIGOPTS="+tcp +noadd +nosea +nostat +nocmd +dnssec -p ${PORT}"
RNDCCMD="$RNDC -s 10.53.0.1 -p ${CONTROLPORT} -c ../common/rndc.conf"
RNDCCMD="$RNDC -s 10.53.0.1 -p ${CONTROLPORT} -c ../_common/rndc.conf"
# Check the example. domain

2
bin/tests/system/digdelv/ns2/named.conf.in
View file

@ -25,7 +25,7 @@ options {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "example" {

2
bin/tests/system/digdelv/ns3/named.conf.in
View file

@ -24,5 +24,5 @@ options {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};

2
bin/tests/system/dispatch/ns2/named.conf.in
View file

@ -41,7 +41,7 @@ options {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "example" {

2
bin/tests/system/dlzexternal/tests.sh
View file

@ -19,7 +19,7 @@ status=0
n=0
DIGOPTS="@10.53.0.1 -p ${PORT} +nocookie"
RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
newtest() {
n=$((n + 1))

2
bin/tests/system/dns64/ns1/named.conf1.in
View file

@ -13,7 +13,7 @@
// NS1
include "../../common/rndc.key";
include "../../_common/rndc.key";
controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

2
bin/tests/system/dns64/ns1/named.conf2.in
View file

@ -13,7 +13,7 @@
// NS1
include "../../common/rndc.key";
include "../../_common/rndc.key";
controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

2
bin/tests/system/dns64/ns1/named.conf3.in
View file

@ -13,7 +13,7 @@
// NS1
include "../../common/rndc.key";
include "../../_common/rndc.key";
controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };

2
bin/tests/system/dns64/ns2/named.conf.in
View file

@ -62,7 +62,7 @@ options {
zone "." {
type hint;
file "../../common/root.hint";
file "../../_common/root.hint";
};
zone "rpz" {

Some files were not shown because too many files have changed in this diff Show more