Add a catalog zone with an unset 'default-primaries' to the catz test

And unset 'default-primaries' is causing an assertion failure after
two reload/reconfig commands. Add such a catalog zone to check the fix.

diff --git a/bin/tests/system/catz/ns1/named.conf.in b/bin/tests/system/catz/ns1/named.conf.in
index 2c04668280ed9aa19e4415e64de81ade436ff6ca..9d508440bd1ebd14881b147e01bd8470734de49d 100644 (file)
--- a/bin/tests/system/catz/ns1/named.conf.in
+++ b/bin/tests/system/catz/ns1/named.conf.in
@@ -38,6 +38,15 @@ options {
 
 view "default" {
 
+       zone "catalog0.example" {
+               type primary;
+               file "catalog0.example.db";
+               allow-transfer { any; };
+               allow-update { any; };
+               also-notify { 10.53.0.2; };
+               notify explicit;
+       };
+
        zone "catalog1.example" {
                type primary;
                file "catalog1.example.db";

diff --git a/bin/tests/system/catz/ns2/named1.conf.in b/bin/tests/system/catz/ns2/named1.conf.in
index 2b8d05217a63b58c944cebe65cd6d657ae784a70..6860153a3115e2fd8a996a1b692c1eab109ad482 100644 (file)
--- a/bin/tests/system/catz/ns2/named1.conf.in
+++ b/bin/tests/system/catz/ns2/named1.conf.in
@@ -43,6 +43,9 @@ options {
 view "default" {
 
        catalog-zones {
+               zone "catalog0.example"
+                       /* unset default-primaries, see GL#5494 */
+                       in-memory yes;
                zone "catalog1.example"
                        default-masters { 10.53.0.1; }
                        min-update-interval 1s
@@ -108,6 +111,12 @@ view "default" {
            forwarders { };
        };
 
+       zone "catalog0.example" {
+               type secondary;
+               file "catalog0.example.db";
+               primaries { 10.53.0.1; };
+       };
+
        zone "catalog1.example" {
                type secondary;
                file "catalog1.example.db";

diff --git a/bin/tests/system/catz/ns2/named2.conf.in b/bin/tests/system/catz/ns2/named2.conf.in
index 2255c6625efe2429497e92d60ecefc939028441a..385adf4deb2387fef7642cbb709f689f45f0c89e 100644 (file)
--- a/bin/tests/system/catz/ns2/named2.conf.in
+++ b/bin/tests/system/catz/ns2/named2.conf.in
@@ -55,6 +55,12 @@ view "default" {
            forwarders { };
        };
 
+       zone "catalog0.example" {
+               type secondary;
+               file "catalog0.example.db";
+               primaries { 10.53.0.1; };
+       };
+
        zone "catalog1.example" {
                type secondary;
                file "catalog1.example.db";

diff --git a/bin/tests/system/catz/setup.sh b/bin/tests/system/catz/setup.sh
index c7e24fa1de548c726ea8abfe2664eca6f6afb8cb..21474678f143fa016e466dcdc16a5d64c7335749 100644 (file)
--- a/bin/tests/system/catz/setup.sh
+++ b/bin/tests/system/catz/setup.sh
@@ -18,6 +18,7 @@ copy_setports ns2/named1.conf.in ns2/named.conf
 copy_setports ns3/named.conf.in ns3/named.conf
 copy_setports ns4/named.conf.in ns4/named.conf
 
+cp -f ns1/catalog.example.db.in ns1/catalog0.example.db
 cp -f ns1/catalog.example.db.in ns1/catalog1.example.db
 cp -f ns3/catalog.example.db.in ns3/catalog2.example.db
 cp -f ns1/catalog.example.db.in ns1/catalog3.example.db