From a2a8b237e6670740c4baedde8980740cd97c6b8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= Date: Tue, 16 Sep 2025 16:28:24 +0200 Subject: [PATCH] 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). (cherry picked from commit 377724c26d399aa82434bee64f9c7dcf29eab0d7) --- .gitlab-ci.yml | 2 +- bin/tests/system/filters/tests_filter_a_v4.py | 2 +- bin/tests/system/filters/tests_filter_a_v6.py | 2 +- bin/tests/system/filters/tests_filter_aaaa_v4.py | 2 +- bin/tests/system/filters/tests_filter_aaaa_v6.py | 2 +- .../rollover-algo-csk/tests_rollover_algo_csk_reconfig.py | 2 +- .../tests_rollover_algo_ksk_zsk_reconfig.py | 2 +- .../tests_rollover_going_insecure_reconfig.py | 4 ++-- .../rollover-lifetime/tests_rollover_lifetime_reconfig.py | 2 +- .../tests_rollver_straight2none_reconfig.py | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b34b68273d..7bf8fc3981 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -695,7 +695,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 e38821b08b..0e143467df 100644 --- 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 f077fad575..8ce36974e2 100644 --- 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 eb23217502..5a78714e24 100644 --- 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 e1a4f74cef..f4dbc70fcd 100644 --- 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 eecf1ba855..8b152b754f 100644 --- 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 ba77d799d5..9de15ba2f1 100644 --- 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 8e74b9bfcf..f59940085d 100644 --- 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 76ee89eff3..9462f1ad97 100644 --- 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 a25b8334f6..dc1fbf2219 100644 --- 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")