From: Nicki Křížek <nicki@isc.org>
Date: Tue, 17 Jun 2025 13:47:48 +0000 (+0200)
Subject: Replace print statements in checkds test
X-Git-Tag: v9.20.11~6^2~7
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=2b77921470c4d73862cbad0191e7ffee90842cfd;p=thirdparty%2Fbind9.git

Replace print statements in checkds test

Use isctest.log logging facility for consistent and predictable logging
output rather than using print(). Remove writes of stderr, as that
output will be logged in the debug log in case the commands called with
isctest.run.cmd() fails.

(cherry picked from commit 4b8998e4ad1eda6e4fca23c362dd8034d6cce3fa)
---

diff --git a/bin/tests/system/checkds/tests_checkds.py b/bin/tests/system/checkds/tests_checkds.py
index 7fed5269072..163c4cc150a 100755
--- a/bin/tests/system/checkds/tests_checkds.py
+++ b/bin/tests/system/checkds/tests_checkds.py
@@ -73,9 +73,9 @@ def has_signed_apex_nsec(zone, response):
             has_rrsig = True
 
     if not has_nsec:
-        print("error: missing apex NSEC record in response")
+        isctest.log.error("missing apex NSEC record in response")
     if not has_rrsig:
-        print("error: missing NSEC signature in response")
+        isctest.log.error("missing NSEC signature in response")
 
     return has_nsec and has_rrsig
 
@@ -103,8 +103,7 @@ def verify_zone(zone, transfer):
     verifier = isctest.run.cmd(verify_cmd)
 
     if verifier.returncode != 0:
-        print(f"error: dnssec-verify {zone} failed")
-        sys.stderr.buffer.write(verifier.stderr)
+        isctest.log.error(f"dnssec-verify {zone} failed")
 
     return verifier.returncode == 0
 
@@ -132,7 +131,7 @@ def read_statefile(server, zone):
     ), f"expected a single DS in response for {zone} from {server.ip}, got {count}"
 
     filename = f"ns9/K{zone}+013+{keyid:05d}.state"
-    print(f"read state file {filename}")
+    isctest.log.debug(f"read state file {filename}")
 
     try:
         with open(filename, "r", encoding="utf-8") as file:
@@ -212,8 +211,7 @@ def rekey(zone):
     controller = isctest.run.cmd(rndc_cmd)
 
     if controller.returncode != 0:
-        print(f"error: rndc loadkeys {zone} failed")
-        sys.stderr.buffer.write(controller.stderr)
+        isctest.log.error(f"rndc loadkeys {zone} failed")
 
     assert controller.returncode == 0