2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 05:28:00 +00:00

Move param to isctest.util

This commit is contained in:
Nicki Křížek 2025-06-06 10:46:42 +02:00
parent 620c884133
commit 481b46ffcc
2 changed files with 8 additions and 6 deletions

View File

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

View File

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