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).
This commit is contained in:
Nicki Křížek 2025-09-16 16:28:24 +02:00
parent fb4345afd4
commit 377724c26d
10 changed files with 11 additions and 11 deletions

View file

@ -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

View file

@ -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")

View file

@ -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")

View file

@ -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")

View file

@ -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")

View file

@ -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")

View file

@ -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")

View file

@ -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(

View file

@ -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")

View file

@ -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")