]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Fix the dnssec_py test marks
authorNicki Křížek <nicki@isc.org>
Tue, 7 Jul 2026 13:48:17 +0000 (15:48 +0200)
committerMichał Kępień <michal@isc.org>
Fri, 10 Jul 2026 07:26:46 +0000 (09:26 +0200)
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).

bin/tests/system/dnssec_py/common.py
bin/tests/system/dnssec_py/tests_findnoqname_mismatch.py

index a972242fd53e269e1b0a20bc04d78f4085ae85ed..ebece637dbf741baea84b87bad1a0248109ed5b0 100644 (file)
 
 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",
+    ]
+)
index 5a4ff9039007f0c26ea274ff4140a6a85aa1ec46..f3a690eaadbafcdae1d1a5c34778250e0c698e00 100644 (file)
@@ -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():