From: Tony Finch <fanf@isc.org>
Date: Wed, 7 Sep 2022 16:57:58 +0000 (+0100)
Subject: Speed up the `catz` system test
X-Git-Tag: v9.19.6~72^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdfe8f23c2fa0aa6ddf2edb8e00c3ee3edbe2596;p=thirdparty%2Fbind9.git

Speed up the `catz` system test

Do not delay sending NOFIFY messages, and allow catalog zones to
update every second instead of every 5 seconds.
---

diff --git a/bin/tests/system/catz/ns1/named.conf.in b/bin/tests/system/catz/ns1/named.conf.in
index e5d688cf516..e1ec120d603 100644
--- a/bin/tests/system/catz/ns1/named.conf.in
+++ b/bin/tests/system/catz/ns1/named.conf.in
@@ -28,6 +28,7 @@ options {
 	listen-on port @EXTRAPORT1@ { 10.53.0.1; };
 	listen-on-v6 { none; };
 	notify no;
+	notify-delay 0;
 	recursion no;
 	allow-transfer { any; };
 };
diff --git a/bin/tests/system/catz/ns2/named1.conf.in b/bin/tests/system/catz/ns2/named1.conf.in
index ba21963625e..002b22cefed 100644
--- a/bin/tests/system/catz/ns2/named1.conf.in
+++ b/bin/tests/system/catz/ns2/named1.conf.in
@@ -26,6 +26,7 @@ options {
 	listen-on { 10.53.0.2; };
 	listen-on-v6 { fd92:7065:b8e:ffff::2; };
 	notify no;
+	notify-delay 0;
 	recursion no;
 	serial-query-rate 100;
 };
@@ -41,29 +42,38 @@ view "default" {
 	catalog-zones {
 		zone "catalog1.example"
 			default-masters { 10.53.0.1; }
+			min-update-interval 1s
 			in-memory no
 			zone-directory "zonedir";
 		zone "catalog2.example"
 			default-primaries { 10.53.0.1 port @EXTRAPORT1@; }
+			min-update-interval 1s
 			in-memory yes;
 		zone "catalog3.example"
 			default-masters { 10.53.0.1; }
+			min-update-interval 1s
 			zone-directory "nonexistent";
 #T1		zone "catalog4.example"
+#T1			min-update-interval 1s
 #T1			default-masters { 10.53.0.1; };
 #T2		zone "catalog5.example"
+#T2			min-update-interval 1s
 #T2			default-primaries { 10.53.0.1; };
 		zone "catalog-bad1.example"
 			default-masters { 10.53.0.1; }
+			min-update-interval 1s
 			in-memory yes;
 		zone "catalog-bad2.example"
 			default-masters { 10.53.0.1; }
+			min-update-interval 1s
 			in-memory yes;
 		zone "catalog-bad3.example"
 			default-masters { 10.53.0.1; }
+			min-update-interval 1s
 			in-memory yes;
 		zone "catalog-bad4.example"
 			default-masters { 10.53.0.1; }
+			min-update-interval 1s
 			in-memory yes;
 	};
 
diff --git a/bin/tests/system/catz/ns2/named2.conf.in b/bin/tests/system/catz/ns2/named2.conf.in
index cd5f2b97c7f..d8fbe08e15d 100644
--- a/bin/tests/system/catz/ns2/named2.conf.in
+++ b/bin/tests/system/catz/ns2/named2.conf.in
@@ -26,6 +26,7 @@ options {
 	listen-on { 10.53.0.2; };
 	listen-on-v6 { fd92:7065:b8e:ffff::2; };
 	notify no;
+	notify-delay 0;
 	recursion no;
 	serial-query-rate 100;
 };
diff --git a/bin/tests/system/catz/ns3/named.conf.in b/bin/tests/system/catz/ns3/named.conf.in
index 7e6a8aefe3e..bb2121ad1ad 100644
--- a/bin/tests/system/catz/ns3/named.conf.in
+++ b/bin/tests/system/catz/ns3/named.conf.in
@@ -28,6 +28,7 @@ options {
 	listen-on { 10.53.0.3; };
 	listen-on-v6 { fd92:7065:b8e:ffff::3; };
 	notify no;
+	notify-delay 0;
 	recursion no;
 };