From: Michal Nowak <mnowak@isc.org>
Date: Wed, 14 Jan 2026 18:27:47 +0000 (+0100)
Subject: Portions of two dnssec-malformed-dnskey tests need querytrace
X-Git-Tag: v9.21.18~29^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d03b3f5a1d3114b30e9f30a82caf9ccf38c0816b;p=thirdparty%2Fbind9.git

Portions of two dnssec-malformed-dnskey tests need querytrace

Without querytrace set, test_malformed_ecdsa and test_multiple_rrsigs
fail on the log_validation_failed string.
---

diff --git a/bin/tests/system/dnssec-malformed-dnskey/tests_malformed_dnskey.py b/bin/tests/system/dnssec-malformed-dnskey/tests_malformed_dnskey.py
index 57d8479dc39..b83edf18739 100644
--- a/bin/tests/system/dnssec-malformed-dnskey/tests_malformed_dnskey.py
+++ b/bin/tests/system/dnssec-malformed-dnskey/tests_malformed_dnskey.py
@@ -12,6 +12,7 @@
 import base64
 from re import compile as Re
 
+import os
 import pytest
 
 pytest.importorskip("cryptography")
@@ -117,7 +118,11 @@ def test_malformed_ecdsa(ns3):
     msg = isctest.query.create("malformed-dnskey.example", "A")
 
     openssl_vers = ns3.log.grep(log_openssl_version)
-    if openssl_vers and int(openssl_vers[0].group(1)) >= 3:
+    if (
+        openssl_vers
+        and int(openssl_vers[0].group(1)) >= 3
+        and os.getenv("FEATURE_QUERYTRACE") == "1"
+    ):
         # extra check for OpenSSL 3.0.0+
         with ns3.watch_log_from_here() as watcher:
             res = isctest.query.tcp(msg, "10.53.0.3")
@@ -162,7 +167,11 @@ def test_multiple_rrsigs(ns3):
         pytest.skip("valid RRSIG listed first in response, re-run test")
 
     openssl_vers = ns3.log.grep(log_openssl_version)
-    if openssl_vers and int(openssl_vers[0].group(1)) >= 3:
+    if (
+        openssl_vers
+        and int(openssl_vers[0].group(1)) >= 3
+        and os.getenv("FEATURE_QUERYTRACE") == "1"
+    ):
         # extra check for OpenSSL 3.0.0+
         with ns3.watch_log_from_here() as watcher:
             res = isctest.query.tcp(msg, "10.53.0.3")