use masterfile-style full in tests where appropriate

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.

diff --git a/bin/tests/system/stub/ns5/named.conf.in b/bin/tests/system/stub/ns5/named.conf.in
index ce1021b2ee052ffc1e915e16b32acee35df6c369..d6905ed20d7e846403b106177cee2d84fcfff377 100644 (file)
--- a/bin/tests/system/stub/ns5/named.conf.in
+++ b/bin/tests/system/stub/ns5/named.conf.in
@@ -19,7 +19,7 @@ options {
        pid-file "named.pid";
        listen-on { 10.53.0.5; };
        listen-on-v6 { none; };
-    dnssec-validation no;
+       dnssec-validation no;
 };
 
 zone "." {
@@ -30,5 +30,6 @@ zone "." {
 zone "example" {
        type stub;
        file "example.db";
+       masterfile-style full;
        primaries { 10.53.0.4 port @PORT@; };
 };

diff --git a/bin/tests/system/stub/tests.sh b/bin/tests/system/stub/tests.sh
index c9071dd204461abb37580728bdbc13571688c498..2311de973dfc56a28abf1009a602d79be30ffc39 100644 (file)
--- a/bin/tests/system/stub/tests.sh
+++ b/bin/tests/system/stub/tests.sh
@@ -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
   grep 'target\.example.*TXT.*"test"' dig.out.ns5 >/dev/null || ret=1
   # 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 'AAAA[[:space:]]+fd92:7065:b8e:ffff::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 'ns4.example.[[:space:]]+300 IN AAAA[[:space:]]+fd92:7065:b8e:ffff::4' ns5/example.db >/dev/null || ret=1
   [ $ret = 0 ] || {
     status=1
     echo_i "failed"