Test that catalog zone names are case-insensitive

Change one of the existing catalog zone names to test that
catalog zones are now case-insensitive.

(cherry picked from commit 6d0e6454ac4cd238a31198a3ef81824e818d0829)

diff --git a/bin/tests/system/catz/ns2/named.conf.j2 b/bin/tests/system/catz/ns2/named.conf.j2
index 21a532262fd6a0e418020561d8e8ce4401b6bf66..57fdde00192fa509d330504e148a6a3903958c27 100644 (file)
--- a/bin/tests/system/catz/ns2/named.conf.j2
+++ b/bin/tests/system/catz/ns2/named.conf.j2
@@ -142,7 +142,8 @@ view "default" {
                primaries { 10.53.0.1; };
        };
 
-       zone "catalog2.example" {
+       /* Also test using a different case */
+       zone "Catalog2.Example" {
                type secondary;
                file "catalog2.example.db";
                primaries { 10.53.0.3; };

diff --git a/bin/tests/system/catz/ns2/named7.conf.j2 b/bin/tests/system/catz/ns2/named7.conf.j2
index 385adf4deb2387fef7642cbb709f689f45f0c89e..257c1676234339cd350b5ef99c8b798c71bed9e6 100644 (file)
--- a/bin/tests/system/catz/ns2/named7.conf.j2
+++ b/bin/tests/system/catz/ns2/named7.conf.j2
@@ -67,7 +67,8 @@ view "default" {
                primaries { 10.53.0.1; };
        };
 
-       zone "catalog2.example" {
+       /* Also test using a different case */
+       zone "Catalog2.Example" {
                type secondary;
                file "catalog2.example.db";
                primaries { 10.53.0.3; };

diff --git a/bin/tests/system/catz/tests.sh b/bin/tests/system/catz/tests.sh
index b060b0401b1647af46545874ff8b760d41d39aee..a91d62b69ce59468bfdc32855bf14868b5f831f3 100644 (file)
--- a/bin/tests/system/catz/tests.sh
+++ b/bin/tests/system/catz/tests.sh
@@ -381,7 +381,7 @@ status=$((status + ret))
 n=$((n + 1))
 echo_i "waiting for secondary to sync up ($n)"
 ret=0
-wait_for_message ns2/named.run "catz: updating catalog zone 'catalog2.example' with serial 2670950425" \
+wait_for_message ns2/named.run "catz: updating catalog zone 'Catalog2.Example' with serial 2670950425" \
   && wait_for_message ns2/named.run "catz: adding zone 'dom2.example' from catalog 'catalog1.example'" \
   && wait_for_message ns2/named.run "catz: adding zone 'dom3.example' from catalog 'catalog1.example'" \
   && wait_for_message ns2/named.run "catz: adding zone 'dom4.example' from catalog 'catalog2.example'" \
@@ -454,7 +454,7 @@ n=$((n + 1))
 echo_i "waiting for secondary to sync up, and checking that the reused label has been caught ($n)"
 ret=0
 wait_for_message ns2/named.run "de26b88d855397a03f77ff1162fd055d8b419584.zones.catalog2.example IN PTR (failure)" \
-  && wait_for_message ns2/named.run "catz: new catalog zone 'catalog2.example' is broken and will not be processed" || ret=1
+  && wait_for_message ns2/named.run "catz: new catalog zone 'Catalog2.Example' is broken and will not be processed" || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status + ret))