From: Evan Hunt <each@isc.org>
Date: Fri, 7 Aug 2026 04:33:29 +0000 (-0700)
Subject: fold more tests into rollover
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccafa707fa4a06eb085dc29006816e66b30eaae7;p=thirdparty%2Fbind9.git

fold more tests into rollover

merge the "rollover_enable_dnssec", "rollover_going_insecure",
and "rollover_straight2none" system tests into "rollover"
---

diff --git a/bin/tests/system/rollover_enable_dnssec/ns3/named.conf.j2 b/bin/tests/system/rollover/ns3/named-enable-dnssec.conf.j2
similarity index 94%
rename from bin/tests/system/rollover_enable_dnssec/ns3/named.conf.j2
rename to bin/tests/system/rollover/ns3/named-enable-dnssec.conf.j2
index d928bd53be5..cd404385fea 100644
--- a/bin/tests/system/rollover_enable_dnssec/ns3/named.conf.j2
+++ b/bin/tests/system/rollover/ns3/named-enable-dnssec.conf.j2
@@ -1,6 +1,6 @@
 {% set zones = ["autosign", "manual"] %}
 
-include "kasp.conf";
+include "policy/enable-dnssec.conf";
 include "named.common.conf";
 
 {% for tld in zones %}
diff --git a/bin/tests/system/rollover_going_insecure/ns3/named.conf.j2 b/bin/tests/system/rollover/ns3/named-going-insecure.conf.j2
similarity index 95%
rename from bin/tests/system/rollover_going_insecure/ns3/named.conf.j2
rename to bin/tests/system/rollover/ns3/named-going-insecure.conf.j2
index 5b144b0843c..a56a9cc05e7 100644
--- a/bin/tests/system/rollover_going_insecure/ns3/named.conf.j2
+++ b/bin/tests/system/rollover/ns3/named-going-insecure.conf.j2
@@ -1,6 +1,6 @@
 {% set policy = policy | default("unsigning") %}
 
-include "kasp.conf";
+include "policy/going-insecure.conf";
 include "named.common.conf";
 
 zone "step1.going-insecure.kasp" {
diff --git a/bin/tests/system/rollover_straight2none/ns3/named.conf.j2 b/bin/tests/system/rollover/ns3/named-straight2none.conf.j2
similarity index 91%
rename from bin/tests/system/rollover_straight2none/ns3/named.conf.j2
rename to bin/tests/system/rollover/ns3/named-straight2none.conf.j2
index c7c04772914..153826cd4bb 100644
--- a/bin/tests/system/rollover_straight2none/ns3/named.conf.j2
+++ b/bin/tests/system/rollover/ns3/named-straight2none.conf.j2
@@ -1,6 +1,6 @@
 {% set policy = policy | default("default") %}
 
-include "kasp.conf";
+include "policy/going-insecure.conf";
 include "named.common.conf";
 
 zone "going-straight-to-none.kasp" {
diff --git a/bin/tests/system/rollover_enable_dnssec/ns3/kasp.conf b/bin/tests/system/rollover/ns3/policy/enable-dnssec.conf
similarity index 100%
rename from bin/tests/system/rollover_enable_dnssec/ns3/kasp.conf
rename to bin/tests/system/rollover/ns3/policy/enable-dnssec.conf
diff --git a/bin/tests/system/rollover_going_insecure/ns3/kasp.conf b/bin/tests/system/rollover/ns3/policy/going-insecure.conf
similarity index 100%
rename from bin/tests/system/rollover_going_insecure/ns3/kasp.conf
rename to bin/tests/system/rollover/ns3/policy/going-insecure.conf
diff --git a/bin/tests/system/rollover/setup.py b/bin/tests/system/rollover/setup.py
index fb30fbd84ae..ce3d112771d 100644
--- a/bin/tests/system/rollover/setup.py
+++ b/bin/tests/system/rollover/setup.py
@@ -1491,7 +1491,7 @@ def configure_enable_dnssec(tld: str, policy: str) -> list[Zone]:
     # initial signing of a zone.
     zones = []
     zone = f"enable-dnssec.{tld}"
-    keygen = EnvCmd("KEYGEN", f"-k {policy} -l policy/enable-dnsssec.conf")
+    keygen = EnvCmd("KEYGEN", f"-k {policy} -l policy/enable-dnssec.conf")
 
     # Step 1:
     # This is an unsigned zone and named should perform the initial steps of
diff --git a/bin/tests/system/rollover_enable_dnssec/tests_rollover_enable_dnssec.py b/bin/tests/system/rollover/tests_rollover_enable_dnssec.py
similarity index 99%
rename from bin/tests/system/rollover_enable_dnssec/tests_rollover_enable_dnssec.py
rename to bin/tests/system/rollover/tests_rollover_enable_dnssec.py
index 09a3bf2ee32..73c44e3fddd 100644
--- a/bin/tests/system/rollover_enable_dnssec/tests_rollover_enable_dnssec.py
+++ b/bin/tests/system/rollover/tests_rollover_enable_dnssec.py
@@ -47,6 +47,7 @@ def bootstrap():
     data = {
         "tlds": [],
         "trust_anchors": [],
+        "testconf": POLICY,
     }
 
     tlds = []
diff --git a/bin/tests/system/rollover_going_insecure/tests_rollover_going_insecure_initial.py b/bin/tests/system/rollover/tests_rollover_going_insecure_initial.py
similarity index 98%
rename from bin/tests/system/rollover_going_insecure/tests_rollover_going_insecure_initial.py
rename to bin/tests/system/rollover/tests_rollover_going_insecure_initial.py
index 75580655641..6d8b4ecb8d5 100644
--- a/bin/tests/system/rollover_going_insecure/tests_rollover_going_insecure_initial.py
+++ b/bin/tests/system/rollover/tests_rollover_going_insecure_initial.py
@@ -23,6 +23,7 @@ def bootstrap():
     data = {
         "tlds": [],
         "trust_anchors": [],
+        "testconf": "going-insecure",
     }
 
     tlds = []
diff --git a/bin/tests/system/rollover_going_insecure/tests_rollover_going_insecure_reconfig.py b/bin/tests/system/rollover/tests_rollover_going_insecure_reconfig.py
similarity index 97%
rename from bin/tests/system/rollover_going_insecure/tests_rollover_going_insecure_reconfig.py
rename to bin/tests/system/rollover/tests_rollover_going_insecure_reconfig.py
index 6afa632a3a3..73ed7ada3fb 100644
--- a/bin/tests/system/rollover_going_insecure/tests_rollover_going_insecure_reconfig.py
+++ b/bin/tests/system/rollover/tests_rollover_going_insecure_reconfig.py
@@ -29,6 +29,7 @@ def bootstrap():
     data = {
         "tlds": [],
         "trust_anchors": [],
+        "testconf": "going-insecure",
     }
 
     tlds = []
@@ -44,7 +45,7 @@ def bootstrap():
 
 @pytest.fixture(scope="module", autouse=True)
 def after_servers_start(ns3, templates):
-    templates.render("ns3/named.conf", {"policy": "insecure"})
+    templates.render("ns3/named-going-insecure.conf", {"policy": "insecure"})
     ns3.reconfigure()  # move from "unsigning" to "insecure"
 
 
diff --git a/bin/tests/system/rollover_straight2none/tests_rollover_straight2none_initial.py b/bin/tests/system/rollover/tests_rollover_straight2none_initial.py
similarity index 97%
rename from bin/tests/system/rollover_straight2none/tests_rollover_straight2none_initial.py
rename to bin/tests/system/rollover/tests_rollover_straight2none_initial.py
index 8670193a178..43408406c1b 100644
--- a/bin/tests/system/rollover_straight2none/tests_rollover_straight2none_initial.py
+++ b/bin/tests/system/rollover/tests_rollover_straight2none_initial.py
@@ -23,6 +23,7 @@ def bootstrap():
     data = {
         "tlds": [],
         "trust_anchors": [],
+        "testconf": "straight2none",
     }
 
     tlds = []
diff --git a/bin/tests/system/rollover_straight2none/tests_rollover_straight2none_reconfig.py b/bin/tests/system/rollover/tests_rollover_straight2none_reconfig.py
similarity index 94%
rename from bin/tests/system/rollover_straight2none/tests_rollover_straight2none_reconfig.py
rename to bin/tests/system/rollover/tests_rollover_straight2none_reconfig.py
index edab463cd19..15a066bd3ab 100644
--- a/bin/tests/system/rollover_straight2none/tests_rollover_straight2none_reconfig.py
+++ b/bin/tests/system/rollover/tests_rollover_straight2none_reconfig.py
@@ -23,6 +23,7 @@ def bootstrap():
     data = {
         "tlds": [],
         "trust_anchors": [],
+        "testconf": "straight2none",
     }
 
     tlds = []
@@ -41,7 +42,7 @@ def after_servers_start(ns3, templates):
     isctest.kasp.wait_keymgr_done(ns3, "going-straight-to-none.kasp")
     isctest.kasp.wait_keymgr_done(ns3, "going-straight-to-none-dynamic.kasp")
 
-    templates.render("ns3/named.conf", {"policy": "none"})
+    templates.render("ns3/named-straight2none.conf", {"policy": "none"})
     ns3.reconfigure()
 
 
diff --git a/bin/tests/system/rollover_enable_dnssec/ns1 b/bin/tests/system/rollover_enable_dnssec/ns1
deleted file mode 120000
index 76608beaedd..00000000000
--- a/bin/tests/system/rollover_enable_dnssec/ns1
+++ /dev/null
@@ -1 +0,0 @@
-../rollover/ns1
\ No newline at end of file
diff --git a/bin/tests/system/rollover_enable_dnssec/ns2 b/bin/tests/system/rollover_enable_dnssec/ns2
deleted file mode 120000
index 41a09bb648b..00000000000
--- a/bin/tests/system/rollover_enable_dnssec/ns2
+++ /dev/null
@@ -1 +0,0 @@
-../rollover/ns2
\ No newline at end of file
diff --git a/bin/tests/system/rollover_enable_dnssec/ns3/named.common.conf.j2 b/bin/tests/system/rollover_enable_dnssec/ns3/named.common.conf.j2
deleted file mode 120000
index 5dc26178cb1..00000000000
--- a/bin/tests/system/rollover_enable_dnssec/ns3/named.common.conf.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover/ns3/named.common.conf.j2
\ No newline at end of file
diff --git a/bin/tests/system/rollover_enable_dnssec/ns3/template.db.j2.manual b/bin/tests/system/rollover_enable_dnssec/ns3/template.db.j2.manual
deleted file mode 120000
index 38619a01b24..00000000000
--- a/bin/tests/system/rollover_enable_dnssec/ns3/template.db.j2.manual
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover/ns3/template.db.j2.manual
\ No newline at end of file
diff --git a/bin/tests/system/rollover_enable_dnssec/ns3/trusted.conf.j2 b/bin/tests/system/rollover_enable_dnssec/ns3/trusted.conf.j2
deleted file mode 120000
index cb0be77b220..00000000000
--- a/bin/tests/system/rollover_enable_dnssec/ns3/trusted.conf.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../_common/trusted.conf.j2
\ No newline at end of file
diff --git a/bin/tests/system/rollover_going_insecure/ns1 b/bin/tests/system/rollover_going_insecure/ns1
deleted file mode 120000
index 76608beaedd..00000000000
--- a/bin/tests/system/rollover_going_insecure/ns1
+++ /dev/null
@@ -1 +0,0 @@
-../rollover/ns1
\ No newline at end of file
diff --git a/bin/tests/system/rollover_going_insecure/ns2 b/bin/tests/system/rollover_going_insecure/ns2
deleted file mode 120000
index 41a09bb648b..00000000000
--- a/bin/tests/system/rollover_going_insecure/ns2
+++ /dev/null
@@ -1 +0,0 @@
-../rollover/ns2
\ No newline at end of file
diff --git a/bin/tests/system/rollover_going_insecure/ns3/named.common.conf.j2 b/bin/tests/system/rollover_going_insecure/ns3/named.common.conf.j2
deleted file mode 120000
index 5dc26178cb1..00000000000
--- a/bin/tests/system/rollover_going_insecure/ns3/named.common.conf.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover/ns3/named.common.conf.j2
\ No newline at end of file
diff --git a/bin/tests/system/rollover_going_insecure/ns3/template.db.j2.manual b/bin/tests/system/rollover_going_insecure/ns3/template.db.j2.manual
deleted file mode 120000
index 38619a01b24..00000000000
--- a/bin/tests/system/rollover_going_insecure/ns3/template.db.j2.manual
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover/ns3/template.db.j2.manual
\ No newline at end of file
diff --git a/bin/tests/system/rollover_going_insecure/ns3/trusted.conf.j2 b/bin/tests/system/rollover_going_insecure/ns3/trusted.conf.j2
deleted file mode 120000
index cb0be77b220..00000000000
--- a/bin/tests/system/rollover_going_insecure/ns3/trusted.conf.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../_common/trusted.conf.j2
\ No newline at end of file
diff --git a/bin/tests/system/rollover_straight2none/ns1 b/bin/tests/system/rollover_straight2none/ns1
deleted file mode 120000
index 76608beaedd..00000000000
--- a/bin/tests/system/rollover_straight2none/ns1
+++ /dev/null
@@ -1 +0,0 @@
-../rollover/ns1
\ No newline at end of file
diff --git a/bin/tests/system/rollover_straight2none/ns2 b/bin/tests/system/rollover_straight2none/ns2
deleted file mode 120000
index 41a09bb648b..00000000000
--- a/bin/tests/system/rollover_straight2none/ns2
+++ /dev/null
@@ -1 +0,0 @@
-../rollover/ns2
\ No newline at end of file
diff --git a/bin/tests/system/rollover_straight2none/ns3/kasp.conf b/bin/tests/system/rollover_straight2none/ns3/kasp.conf
deleted file mode 120000
index 5b994bf8975..00000000000
--- a/bin/tests/system/rollover_straight2none/ns3/kasp.conf
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover_going_insecure/ns3/kasp.conf
\ No newline at end of file
diff --git a/bin/tests/system/rollover_straight2none/ns3/named.common.conf.j2 b/bin/tests/system/rollover_straight2none/ns3/named.common.conf.j2
deleted file mode 120000
index 5dc26178cb1..00000000000
--- a/bin/tests/system/rollover_straight2none/ns3/named.common.conf.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover/ns3/named.common.conf.j2
\ No newline at end of file
diff --git a/bin/tests/system/rollover_straight2none/ns3/template.db.j2.manual b/bin/tests/system/rollover_straight2none/ns3/template.db.j2.manual
deleted file mode 120000
index 38619a01b24..00000000000
--- a/bin/tests/system/rollover_straight2none/ns3/template.db.j2.manual
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover/ns3/template.db.j2.manual
\ No newline at end of file
diff --git a/bin/tests/system/rollover_straight2none/ns3/trusted.conf.j2 b/bin/tests/system/rollover_straight2none/ns3/trusted.conf.j2
deleted file mode 120000
index cb0be77b220..00000000000
--- a/bin/tests/system/rollover_straight2none/ns3/trusted.conf.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../_common/trusted.conf.j2
\ No newline at end of file