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

Rename system test directory with common files to _common

Browse Source 
The old name "common" clashes with the convention of system test
directory naming. It appears as a system test directory, but it only
contains helper files.

To reduce confusion and to allow automatic detection of issues with
possibly missing test files, rename the helper directory to "_common".
The leading underscore indicates the directory is different and the its
name can no longer be confused with regular system test directories.
This commit is contained in:
Tom Krizek
2023-09-18 17:25:17 +02:00
parent 7f91925dad
commit 168dba163c
247 changed files with 287 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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)