fold in rollover_lifetime

diff --git a/bin/tests/system/rollover/common.py b/bin/tests/system/rollover/common.py
index 0b0eedf0eb0796e4564244b10946cff5cc0887ed..9e8420d8e3de2f2a4cf5654e9a3327242047caf6 100644 (file)
--- 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 aef7dbfa22825067f64ca00fe6fadb8652d36843..b07bc55af0f9fa545a08d348fee123cc5438ac72 100644 (file)
--- 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 449d5b8a769dd945b3bce66c68a0e3f7b04dae4a..e7b0aaf378b2141fc479fc40fe8a8f421e4e886b 100644 (file)
--- 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 0576b83d50e17191eac03adebe4d2f8c7f887248..285ba3d1f5a9f61cfd965535e37b5b235a4bb938 100644 (file)
--- 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 (symlink)
index e9d5917..0000000
--- 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 (symlink)
index e9d5917..0000000
--- 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 (symlink)
index 5dc2617..0000000
--- 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 (symlink)
index e9d5917..0000000
--- 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 (symlink)
index e9d5917..0000000
--- a/bin/tests/system/rollover_lifetime/ns3/unlimit-lifetime.db
+++ /dev/null
@@ -1 +0,0 @@
-template.db.in
\ No newline at end of file