From: Nicki Křížek Date: Tue, 7 Jul 2026 13:48:17 +0000 (+0200) Subject: Fix the dnssec_py test marks X-Git-Tag: v9.21.24~2^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=869e2e7fc60392fb37025ca9e0357053f6f73e68;p=thirdparty%2Fbind9.git Fix the dnssec_py test marks The isctest.mark.with_ecdsa_deterministic was accidentally applied to all dnssec_py modules rather than just tests_findnoqname_mismatch.py. Also, `isctest.mark` has to be imported using the full path, otherwise it might not be properly loaded (this only worked in CI due to test ordering). --- diff --git a/bin/tests/system/dnssec_py/common.py b/bin/tests/system/dnssec_py/common.py index a972242fd53..ebece637dbf 100644 --- a/bin/tests/system/dnssec_py/common.py +++ b/bin/tests/system/dnssec_py/common.py @@ -11,19 +11,14 @@ import pytest -import isctest - -DNSSEC_PY_MARK = [ - isctest.mark.with_ecdsa_deterministic, - pytest.mark.extra_artifacts( - [ - "ans*/*.db", - "ans*/*.run", - "ans*/*.pem", - "ns*/dsset-*", - "ns*/trusted.conf", - "ns*/zones/*.db", - "ns*/zones/*.db.signed", - ] - ), -] +DNSSEC_PY_MARK = pytest.mark.extra_artifacts( + [ + "ans*/*.db", + "ans*/*.run", + "ans*/*.pem", + "ns*/dsset-*", + "ns*/trusted.conf", + "ns*/zones/*.db", + "ns*/zones/*.db.signed", + ] +) diff --git a/bin/tests/system/dnssec_py/tests_findnoqname_mismatch.py b/bin/tests/system/dnssec_py/tests_findnoqname_mismatch.py index 5a4ff903900..f3a690eaadb 100644 --- a/bin/tests/system/dnssec_py/tests_findnoqname_mismatch.py +++ b/bin/tests/system/dnssec_py/tests_findnoqname_mismatch.py @@ -18,6 +18,7 @@ from isctest.template import NS4, NS9, Nameserver, zones from isctest.zone import PythonZoneKey, Zone import isctest +import isctest.mark ZONE = "f217.test." CHILD = f"evil.{ZONE}" @@ -27,7 +28,7 @@ FORGED_A = "192.0.2.217" AUTH = "10.53.0.4" RESOLVER = "10.53.0.9" -pytestmark = DNSSEC_PY_MARK +pytestmark = [isctest.mark.with_ecdsa_deterministic, DNSSEC_PY_MARK] def _make_key():