From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Thu, 27 Jun 2019 07:58:54 +0000 (+0200)
Subject: tests-extra: improve Zonefile.dnssec_verify() logging
X-Git-Tag: v2.9.0~237
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c073009dce3fde902e6dc2fbf75450a50f8ddf2;p=thirdparty%2Fknot-dns.git

tests-extra: improve Zonefile.dnssec_verify() logging
---

diff --git a/tests-extra/tools/dnstest/server.py b/tests-extra/tools/dnstest/server.py
index 80cf8ef316..82bf33e522 100644
--- a/tests-extra/tools/dnstest/server.py
+++ b/tests-extra/tools/dnstest/server.py
@@ -657,7 +657,7 @@ class Server(object):
 
         self.zones[zone.name].zfile.backup()
 
-    def zone_verify(self, zone, bind_check=None, ldns_check=None):
+    def zone_verify(self, zone, bind_check=True, ldns_check=True):
         zone = zone_arg_check(zone)
 
         self.zones[zone.name].zfile.dnssec_verify(bind_check, ldns_check)
diff --git a/tests-extra/tools/dnstest/zonefile.py b/tests-extra/tools/dnstest/zonefile.py
index c35ea3e782..dfd78021af 100644
--- a/tests-extra/tools/dnstest/zonefile.py
+++ b/tests-extra/tools/dnstest/zonefile.py
@@ -129,8 +129,10 @@ class ZoneFile(object):
 
             if cmd.returncode != 0:
                 set_err("DNSSEC VERIFY")
-                detail_log("dnssec-verify:\n" + err.strip())
+                detail_log(" <dnssec-verify>\n" + err.strip())
                 self.backup()
+            else:
+                detail_log(" <dnssec-verify>\n" + err.strip())
 
         if ldns_check:
             cmd = Popen(["ldns-verify-zone", self.path],
@@ -139,8 +141,10 @@ class ZoneFile(object):
 
             if cmd.returncode != 0:
                 set_err("LDNS VERIFY")
-                detail_log("ldns-verify-zone:\n" + err.strip())
+                detail_log(" <ldns-verify-zone>\n" + err.strip())
                 self.backup()
+            else:
+                detail_log(" <ldns-verify-zone>\n" + out.strip())
 
         detail_log(SEP)