Use common name for post-startup server functions

Unify the names of autouse module-wide fixtures that perform
after_servers_start() setup. The consistent naming doesn't just help
readability, but also makes it simpler for the vulture exception (since
it doesn't properly deal with autouse fixtures).

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 17985b8f07f75c23fac65ebe3484dd492daebd9a..d1e7c3f14bc01f5b02abe04d3177f8728050ddc5 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -641,7 +641,7 @@ vulture:
   <<: *python_triggering_rules
   needs: []
   script:
-    - vulture --exclude "*ans.py,conftest.py,isctest" --ignore-names "bootstrap,pytestmark,reconfigure_policy,setup_filters" bin/tests/system/
+    - vulture --exclude "*ans.py,conftest.py,isctest" --ignore-names "after_servers_start,bootstrap,pytestmark" bin/tests/system/
 
 ci-variables:
   <<: *precheck_job

diff --git a/bin/tests/system/filters/tests_filter_a_v4.py b/bin/tests/system/filters/tests_filter_a_v4.py
index e38821b08ba149afb9f5e6d18f2febeff1c6fa11..0e143467df761ebcbbf3ac95419222b5d782175b 100644 (file)
--- a/bin/tests/system/filters/tests_filter_a_v4.py
+++ b/bin/tests/system/filters/tests_filter_a_v4.py
@@ -32,7 +32,7 @@ def bootstrap():
 
 
 @pytest.fixture(scope="module", autouse=True)
-def setup_filters():
+def after_servers_start():
     prime_cache("10.53.0.2")
     prime_cache("10.53.0.3")
 

diff --git a/bin/tests/system/filters/tests_filter_a_v6.py b/bin/tests/system/filters/tests_filter_a_v6.py
index f077fad575349c657d5eb1e18e88228e063508f7..8ce36974e26e6961c31197a6b8ff6ccc80d303be 100644 (file)
--- a/bin/tests/system/filters/tests_filter_a_v6.py
+++ b/bin/tests/system/filters/tests_filter_a_v6.py
@@ -32,7 +32,7 @@ def bootstrap():
 
 
 @pytest.fixture(scope="module", autouse=True)
-def setup_filters():
+def after_servers_start():
     prime_cache("fd92:7065:b8e:ffff::2")
     prime_cache("fd92:7065:b8e:ffff::3")
 

diff --git a/bin/tests/system/filters/tests_filter_aaaa_v4.py b/bin/tests/system/filters/tests_filter_aaaa_v4.py
index eb232175024f5f6001f6115ade214f0ae885b88c..5a78714e241a62ab3417aba13ed9aa0e07ea3c86 100644 (file)
--- a/bin/tests/system/filters/tests_filter_aaaa_v4.py
+++ b/bin/tests/system/filters/tests_filter_aaaa_v4.py
@@ -33,7 +33,7 @@ def bootstrap():
 
 
 @pytest.fixture(scope="module", autouse=True)
-def setup_filters():
+def after_servers_start():
     prime_cache("10.53.0.2")
     prime_cache("10.53.0.3")
 

diff --git a/bin/tests/system/filters/tests_filter_aaaa_v6.py b/bin/tests/system/filters/tests_filter_aaaa_v6.py
index e1a4f74cef9ed14dde2d3537c1ce8577836fc310..f4dbc70fcd66feef7064e468640b024c74322b34 100644 (file)
--- a/bin/tests/system/filters/tests_filter_aaaa_v6.py
+++ b/bin/tests/system/filters/tests_filter_aaaa_v6.py
@@ -32,7 +32,7 @@ def bootstrap():
 
 
 @pytest.fixture(scope="module", autouse=True)
-def setup_filters():
+def after_servers_start():
     prime_cache("fd92:7065:b8e:ffff::2")
     prime_cache("fd92:7065:b8e:ffff::3")
 

diff --git a/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_reconfig.py b/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_reconfig.py
index eecf1ba855b6f10523a79db88544231bf06bfff8..8b152b754fec42f127f4b2bc580b5955f45e608c 100644 (file)
--- a/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_reconfig.py
+++ b/bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_reconfig.py
@@ -39,7 +39,7 @@ TIME_PASSED = 0  # set in reconfigure() fixture
 
 
 @pytest.fixture(scope="module", autouse=True)
-def reconfigure(ns6, templates):
+def after_servers_start(ns6, templates):
     global TIME_PASSED  # pylint: disable=global-statement
 
     isctest.kasp.wait_keymgr_done(ns6, "step1.csk-algorithm-roll.kasp")

diff --git a/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_reconfig.py b/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_reconfig.py
index ba77d799d5dfd4730bf97dc8bfe13e62a87a3d57..9de15ba2f131970925035c35300258ffa7ba29df 100644 (file)
--- a/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_reconfig.py
+++ b/bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_reconfig.py
@@ -39,7 +39,7 @@ TIME_PASSED = 0  # set in reconfigure() fixture
 
 
 @pytest.fixture(scope="module", autouse=True)
-def reconfigure(ns6, templates):
+def after_servers_start(ns6, templates):
     global TIME_PASSED  # pylint: disable=global-statement
 
     isctest.kasp.wait_keymgr_done(ns6, "step1.algorithm-roll.kasp")

diff --git a/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_reconfig.py b/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_reconfig.py
index 8e74b9bfcffae1a6d5bbcb694d2fc9bec3921a34..f59940085de20657fb3a7ec3c7d0cab61e77bd32 100644 (file)
--- a/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_reconfig.py
+++ b/bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_reconfig.py
@@ -26,9 +26,9 @@ from rollover.common import (
 
 
 @pytest.fixture(scope="module", autouse=True)
-def reconfigure_policy(ns6, templates):
+def after_servers_start(ns6, templates):
     templates.render("ns6/named.conf", {"policy": "insecure"})
-    ns6.reconfigure()
+    ns6.reconfigure()  # move from "unsigning" to "insecure"
 
 
 @pytest.mark.parametrize(

diff --git a/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_reconfig.py b/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_reconfig.py
index 76ee89eff37d6e9995f21fdbf2227da3e8f44053..9462f1ad9722e51c6c433702d73450201ab599bf 100644 (file)
--- a/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_reconfig.py
+++ b/bin/tests/system/rollover-lifetime/tests_rollover_lifetime_reconfig.py
@@ -26,7 +26,7 @@ from rollover.common import (
 
 
 @pytest.fixture(scope="module", autouse=True)
-def reconfigure_policy(ns6, templates):
+def after_servers_start(ns6, templates):
     isctest.kasp.wait_keymgr_done(ns6, "shorter-lifetime")
     isctest.kasp.wait_keymgr_done(ns6, "longer-lifetime")
     isctest.kasp.wait_keymgr_done(ns6, "limit-lifetime")

diff --git a/bin/tests/system/rollover-straight2none/tests_rollver_straight2none_reconfig.py b/bin/tests/system/rollover-straight2none/tests_rollver_straight2none_reconfig.py
index a25b8334f6f6273307524969541c4732ae1dc028..dc1fbf22198649efd0bda0fa120dc85429fa2a37 100644 (file)
--- a/bin/tests/system/rollover-straight2none/tests_rollver_straight2none_reconfig.py
+++ b/bin/tests/system/rollover-straight2none/tests_rollver_straight2none_reconfig.py
@@ -25,7 +25,7 @@ from rollover.common import (
 
 
 @pytest.fixture(scope="module", autouse=True)
-def reconfigure_policy(ns6, templates):
+def after_servers_start(ns6, templates):
     isctest.kasp.wait_keymgr_done(ns6, "going-straight-to-none.kasp")
     isctest.kasp.wait_keymgr_done(ns6, "going-straight-to-none-dynamic.kasp")