diff --git a/bin/tests/system/isctest/util.py b/bin/tests/system/isctest/util.py index 904e088ff6..eec03ae724 100644 --- a/bin/tests/system/isctest/util.py +++ b/bin/tests/system/isctest/util.py @@ -10,6 +10,7 @@ # information regarding copyright ownership. import dns.zone +import pytest def zone_contains( @@ -40,3 +41,9 @@ def file_contents_contain(file, substr): if f"{substr}" in line: return True return False + + +def param(*args, **kwargs): + if "id" not in kwargs: + kwargs["id"] = args[0] # use first argument as test ID + return pytest.param(*args, **kwargs) diff --git a/bin/tests/system/kasp/tests_kasp.py b/bin/tests/system/kasp/tests_kasp.py index e6bc020554..2440914995 100644 --- a/bin/tests/system/kasp/tests_kasp.py +++ b/bin/tests/system/kasp/tests_kasp.py @@ -26,6 +26,7 @@ from isctest.kasp import ( KeyProperties, KeyTimingMetadata, ) +from isctest.util import param from isctest.vars.algorithms import ECDSAP256SHA256, ECDSAP384SHA384 pytestmark = pytest.mark.extra_artifacts( @@ -129,12 +130,6 @@ KASP_INHERIT_TSIG_SECRET = { } -def param(*args, **kwargs): - if "id" not in kwargs: - kwargs["id"] = args[0] # use first argument as test ID - return pytest.param(*args, **kwargs) - - def autosign_properties(alg, size): return [ f"ksk {lifetime['P2Y']} {alg} {size} goal:omnipresent dnskey:omnipresent krrsig:omnipresent ds:omnipresent",