mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

use masterfile-style full in tests where appropriate

Browse Source 
the change from RBT to QP has changed the contents of generated zone
files slightly: node names are now always absolute, so instead of using
$ORIGIN and relative names, generated zone files use full names for all
records.

this caused a failure in the stub system test, which was grepping for a
relative name in a dumped zone file. using "masterfile-style full" makes
the test pass regardless of the database being used.
This commit is contained in:
Evan Hunt
2023-12-01 16:48:21 -08:00
committed by Matthijs Mekking
parent e91fbd8dea
commit 6df391d610
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/tests/system/stub/ns5/named.conf.in
View File

@@ -19,7 +19,7 @@ options {
pid-file "named.pid"; pid-file "named.pid";
listen-on { 10.53.0.5; }; listen-on { 10.53.0.5; };
listen-on-v6 { none; }; listen-on-v6 { none; };
dnssec-validation no; dnssec-validation no;
}; };
zone "." { zone "." {
@@ -30,5 +30,6 @@ zone "." {
zone "example" { zone "example" {
type stub; type stub;
file "example.db"; file "example.db";
masterfile-style full;
primaries { 10.53.0.4 port @PORT@; }; primaries { 10.53.0.4 port @PORT@; };
}; };

4
bin/tests/system/stub/tests.sh
View File

@@ -85,8 +85,8 @@ if [ -f ns5/example.db ]; then
$DIG $DIGOPTS +nodnssec @10.53.0.5 target.example. txt >dig.out.ns5 || ret=1 $DIG $DIGOPTS +nodnssec @10.53.0.5 target.example. txt >dig.out.ns5 || ret=1
grep 'target\.example.*TXT.*"test"' dig.out.ns5 >/dev/null || ret=1 grep 'target\.example.*TXT.*"test"' dig.out.ns5 >/dev/null || ret=1
# Ensure both ipv4 and ipv6 glue records were transferred. # Ensure both ipv4 and ipv6 glue records were transferred.
grep -E 'ns4[[:space:]]+A[[:space:]]+10.53.0.4' ns5/example.db >/dev/null || ret=1 grep -E 'ns4.example.[[:space:]]+300 IN A[[:space:]]+10.53.0.4' ns5/example.db >/dev/null || ret=1
grep -E 'AAAA[[:space:]]+fd92:7065:b8e:ffff::4' ns5/example.db >/dev/null || ret=1 grep -E 'ns4.example.[[:space:]]+300 IN AAAA[[:space:]]+fd92:7065:b8e:ffff::4' ns5/example.db >/dev/null || ret=1
[ $ret = 0 ] || { [ $ret = 0 ] || {
status=1 status=1
echo_i "failed" echo_i "failed"