From: Evan Hunt <each@isc.org>
Date: Fri, 7 Aug 2026 06:17:35 +0000 (-0700)
Subject: fold in dynamic2inline
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6b7228306475edfb14717d67cb9f0605af51510;p=thirdparty%2Fbind9.git

fold in dynamic2inline
---

diff --git a/bin/tests/system/rollover/ns2/named.conf.j2 b/bin/tests/system/rollover/ns2/named.conf.j2
index b26d6150f24..e71bf745203 100644
--- a/bin/tests/system/rollover/ns2/named.conf.j2
+++ b/bin/tests/system/rollover/ns2/named.conf.j2
@@ -12,9 +12,11 @@ options {
 
 {% include "_common/root.hint.conf" %}
 
+{% if tlds is defined %}
 {% for zone in tlds %}
 zone "@zone@" {
 	type primary;
 	file "@zone@.db.signed";
 };
 {% endfor %}
+{% endif %}
diff --git a/bin/tests/system/rollover_dynamic2inline/ns3/dynamic2inline.kasp.db b/bin/tests/system/rollover/ns3/dynamic2inline.kasp.db
similarity index 100%
rename from bin/tests/system/rollover_dynamic2inline/ns3/dynamic2inline.kasp.db
rename to bin/tests/system/rollover/ns3/dynamic2inline.kasp.db
diff --git a/bin/tests/system/rollover_dynamic2inline/ns3/named.conf.j2 b/bin/tests/system/rollover/ns3/named-dynamic2inline.conf.j2
similarity index 100%
rename from bin/tests/system/rollover_dynamic2inline/ns3/named.conf.j2
rename to bin/tests/system/rollover/ns3/named-dynamic2inline.conf.j2
diff --git a/bin/tests/system/rollover_dynamic2inline/tests_rollover_dynamic2inline.py b/bin/tests/system/rollover/tests_rollover_dynamic2inline.py
similarity index 85%
rename from bin/tests/system/rollover_dynamic2inline/tests_rollover_dynamic2inline.py
rename to bin/tests/system/rollover/tests_rollover_dynamic2inline.py
index eff0fedc993..5784e0ed010 100644
--- a/bin/tests/system/rollover_dynamic2inline/tests_rollover_dynamic2inline.py
+++ b/bin/tests/system/rollover/tests_rollover_dynamic2inline.py
@@ -16,6 +16,15 @@ import isctest
 pytestmark = ROLLOVER_MARK
 
 
+def bootstrap():
+    data = {
+        "testconf": "dynamic2inline",
+        "trust_anchors": [],
+    }
+
+    return data
+
+
 def test_dynamic2inline(ns3, default_algorithm, templates):
     config = DEFAULT_CONFIG
     policy = "default"
@@ -34,7 +43,7 @@ def test_dynamic2inline(ns3, default_algorithm, templates):
 
     isctest.kasp.check_rollover_step(ns3, config, policy, step)
 
-    templates.render("ns3/named.conf", {"change_lifetime": True})
+    templates.render("ns3/named-dynamic2inline.conf", {"change_lifetime": True})
     ns3.reconfigure()
     isctest.kasp.wait_keymgr_done(ns3, zone, reconfig=True)
 
diff --git a/bin/tests/system/rollover_dynamic2inline/ns3/named.common.conf.j2 b/bin/tests/system/rollover_dynamic2inline/ns3/named.common.conf.j2
deleted file mode 120000
index 5dc26178cb1..00000000000
--- a/bin/tests/system/rollover_dynamic2inline/ns3/named.common.conf.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover/ns3/named.common.conf.j2
\ No newline at end of file