From: Evan Hunt Date: Fri, 7 Aug 2026 06:38:11 +0000 (-0700) Subject: fold in rollover_lifetime X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=620855113a1c8ca8a2f0a247a4655497dad31a68;p=thirdparty%2Fbind9.git fold in rollover_lifetime --- diff --git a/bin/tests/system/rollover/common.py b/bin/tests/system/rollover/common.py index 0b0eedf0eb0..9e8420d8e3d 100644 --- a/bin/tests/system/rollover/common.py +++ b/bin/tests/system/rollover/common.py @@ -34,6 +34,7 @@ ROLLOVER_MARK = pytest.mark.extra_artifacts( "ns*/K*.state", "ns*/keygen.out.*", "ns*/managed-keys.**", + "ns*/policy/*.conf", "ns*/settime.out.*", "ns*/signer.out.*", "ns*/zones", diff --git a/bin/tests/system/rollover_lifetime/ns3/template.db.in b/bin/tests/system/rollover/ns3/lifetime.db.in similarity index 100% rename from bin/tests/system/rollover_lifetime/ns3/template.db.in rename to bin/tests/system/rollover/ns3/lifetime.db.in diff --git a/bin/tests/system/rollover_lifetime/ns3/named.conf.j2 b/bin/tests/system/rollover/ns3/named-lifetime.conf.j2 similarity index 96% rename from bin/tests/system/rollover_lifetime/ns3/named.conf.j2 rename to bin/tests/system/rollover/ns3/named-lifetime.conf.j2 index aef7dbfa228..b07bc55af0f 100644 --- a/bin/tests/system/rollover_lifetime/ns3/named.conf.j2 +++ b/bin/tests/system/rollover/ns3/named-lifetime.conf.j2 @@ -4,7 +4,7 @@ {% set limit = "unlimited-lifetime" if not change_lifetime else "short-lifetime" %} {% set unlimit = "short-lifetime" if not change_lifetime else "unlimited-lifetime" %} -include "kasp.conf"; +include "policy/lifetime.conf"; include "named.common.conf"; zone longer-lifetime.kasp { diff --git a/bin/tests/system/rollover_lifetime/ns3/kasp.conf.j2 b/bin/tests/system/rollover/ns3/policy/lifetime.conf.j2 similarity index 100% rename from bin/tests/system/rollover_lifetime/ns3/kasp.conf.j2 rename to bin/tests/system/rollover/ns3/policy/lifetime.conf.j2 diff --git a/bin/tests/system/rollover_lifetime/tests_rollover_lifetime_initial.py b/bin/tests/system/rollover/tests_rollover_lifetime_initial.py similarity index 78% rename from bin/tests/system/rollover_lifetime/tests_rollover_lifetime_initial.py rename to bin/tests/system/rollover/tests_rollover_lifetime_initial.py index 449d5b8a769..e7b0aaf378b 100644 --- a/bin/tests/system/rollover_lifetime/tests_rollover_lifetime_initial.py +++ b/bin/tests/system/rollover/tests_rollover_lifetime_initial.py @@ -9,6 +9,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +import shutil + import pytest from isctest.util import param @@ -19,6 +21,20 @@ import isctest pytestmark = ROLLOVER_MARK +def bootstrap(): + data = { + "testconf": "lifetime", + "trust_anchors": [], + } + + shutil.copyfile("ns3/lifetime.db.in", "ns3/longer-lifetime.db") + shutil.copyfile("ns3/lifetime.db.in", "ns3/shorter-lifetime.db") + shutil.copyfile("ns3/lifetime.db.in", "ns3/limit-lifetime.db") + shutil.copyfile("ns3/lifetime.db.in", "ns3/unlimit-lifetime.db") + + return data + + @pytest.mark.parametrize( "zone, policy, lifetime", [ diff --git a/bin/tests/system/rollover_lifetime/tests_rollover_lifetime_reconfig.py b/bin/tests/system/rollover/tests_rollover_lifetime_reconfig.py similarity index 79% rename from bin/tests/system/rollover_lifetime/tests_rollover_lifetime_reconfig.py rename to bin/tests/system/rollover/tests_rollover_lifetime_reconfig.py index 0576b83d50e..285ba3d1f5a 100644 --- a/bin/tests/system/rollover_lifetime/tests_rollover_lifetime_reconfig.py +++ b/bin/tests/system/rollover/tests_rollover_lifetime_reconfig.py @@ -9,6 +9,8 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +import shutil + import pytest from isctest.util import param @@ -19,6 +21,20 @@ import isctest pytestmark = ROLLOVER_MARK +def bootstrap(): + data = { + "testconf": "lifetime", + "trust_anchors": [], + } + + shutil.copyfile("ns3/lifetime.db.in", "ns3/longer-lifetime.db") + shutil.copyfile("ns3/lifetime.db.in", "ns3/shorter-lifetime.db") + shutil.copyfile("ns3/lifetime.db.in", "ns3/limit-lifetime.db") + shutil.copyfile("ns3/lifetime.db.in", "ns3/unlimit-lifetime.db") + + return data + + @pytest.fixture(scope="module", autouse=True) def after_servers_start(ns3, templates): isctest.kasp.wait_keymgr_done(ns3, "shorter-lifetime.kasp") @@ -26,7 +42,7 @@ def after_servers_start(ns3, templates): isctest.kasp.wait_keymgr_done(ns3, "limit-lifetime.kasp") isctest.kasp.wait_keymgr_done(ns3, "unlimit-lifetime.kasp") - templates.render("ns3/named.conf", {"change_lifetime": True}) + templates.render("ns3/named-lifetime.conf", {"change_lifetime": True}) ns3.reconfigure() diff --git a/bin/tests/system/rollover_lifetime/ns3/limit-lifetime.db b/bin/tests/system/rollover_lifetime/ns3/limit-lifetime.db deleted file mode 120000 index e9d5917b1f4..00000000000 --- a/bin/tests/system/rollover_lifetime/ns3/limit-lifetime.db +++ /dev/null @@ -1 +0,0 @@ -template.db.in \ No newline at end of file diff --git a/bin/tests/system/rollover_lifetime/ns3/longer-lifetime.db b/bin/tests/system/rollover_lifetime/ns3/longer-lifetime.db deleted file mode 120000 index e9d5917b1f4..00000000000 --- a/bin/tests/system/rollover_lifetime/ns3/longer-lifetime.db +++ /dev/null @@ -1 +0,0 @@ -template.db.in \ No newline at end of file diff --git a/bin/tests/system/rollover_lifetime/ns3/named.common.conf.j2 b/bin/tests/system/rollover_lifetime/ns3/named.common.conf.j2 deleted file mode 120000 index 5dc26178cb1..00000000000 --- a/bin/tests/system/rollover_lifetime/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_lifetime/ns3/shorter-lifetime.db b/bin/tests/system/rollover_lifetime/ns3/shorter-lifetime.db deleted file mode 120000 index e9d5917b1f4..00000000000 --- a/bin/tests/system/rollover_lifetime/ns3/shorter-lifetime.db +++ /dev/null @@ -1 +0,0 @@ -template.db.in \ No newline at end of file diff --git a/bin/tests/system/rollover_lifetime/ns3/unlimit-lifetime.db b/bin/tests/system/rollover_lifetime/ns3/unlimit-lifetime.db deleted file mode 120000 index e9d5917b1f4..00000000000 --- a/bin/tests/system/rollover_lifetime/ns3/unlimit-lifetime.db +++ /dev/null @@ -1 +0,0 @@ -template.db.in \ No newline at end of file