Rename kasp function to check_*

If a function is expected to assert / raise on failure (rather than
return boolean), its name should start with "check_".

diff --git a/bin/tests/system/isctest/kasp.py b/bin/tests/system/isctest/kasp.py
index 6fbc57b3b5d0f2aeb02204e7ad874a15325b88bf..a2bc24d92654aebbc5d9f1398a055fbef72a6e63 100644 (file)
--- a/bin/tests/system/isctest/kasp.py
+++ b/bin/tests/system/isctest/kasp.py
@@ -232,7 +232,7 @@ class Key:
         return self.path
 
 
-def zone_is_signed(server, zone):
+def check_zone_is_signed(server, zone):
     addr = server.ip
     fqdn = f"{zone}."
 
@@ -283,7 +283,7 @@ def zone_is_signed(server, zone):
     assert signed
 
 
-def dnssec_verify(server, zone):
+def check_dnssec_verify(server, zone):
     # Check if zone if DNSSEC valid with dnssec-verify.
     fqdn = f"{zone}."
     transfer = _query(server, fqdn, dns.rdatatype.AXFR)

diff --git a/bin/tests/system/ksr/tests_ksr.py b/bin/tests/system/ksr/tests_ksr.py
index 73a0fa0fb39dc86dd18083588be915cca88b7a7b..fa61c3ef873495ba2f5ef67ed60d40ddfdd08afa 100644 (file)
--- a/bin/tests/system/ksr/tests_ksr.py
+++ b/bin/tests/system/ksr/tests_ksr.py
@@ -584,9 +584,9 @@ def test_ksr_common(servers):
     # - check rndc dnssec -status output
     isctest.kasp.check_dnssecstatus(ns1, zone, overlapping_zsks, policy=policy)
     # - zone is signed
-    isctest.kasp.zone_is_signed(ns1, zone)
+    isctest.kasp.check_zone_is_signed(ns1, zone)
     # - dnssec_verify
-    isctest.kasp.dnssec_verify(ns1, zone)
+    isctest.kasp.check_dnssec_verify(ns1, zone)
     # - check keys
     check_keys(overlapping_zsks, lifetime, alg, size, with_state=True)
     # - check apex
@@ -662,9 +662,9 @@ def test_ksr_lastbundle(servers):
     # - check rndc dnssec -status output
     isctest.kasp.check_dnssecstatus(ns1, zone, zsks, policy=policy)
     # - zone is signed
-    isctest.kasp.zone_is_signed(ns1, zone)
+    isctest.kasp.check_zone_is_signed(ns1, zone)
     # - dnssec_verify
-    isctest.kasp.dnssec_verify(ns1, zone)
+    isctest.kasp.check_dnssec_verify(ns1, zone)
     # - check keys
     check_keys(zsks, lifetime, alg, size, offset=offset, with_state=True)
     # - check apex
@@ -745,9 +745,9 @@ def test_ksr_inthemiddle(servers):
     # - check rndc dnssec -status output
     isctest.kasp.check_dnssecstatus(ns1, zone, zsks, policy=policy)
     # - zone is signed
-    isctest.kasp.zone_is_signed(ns1, zone)
+    isctest.kasp.check_zone_is_signed(ns1, zone)
     # - dnssec_verify
-    isctest.kasp.dnssec_verify(ns1, zone)
+    isctest.kasp.check_dnssec_verify(ns1, zone)
     # - check keys
     check_keys(zsks, lifetime, alg, size, offset=offset, with_state=True)
     # - check apex
@@ -942,9 +942,9 @@ def test_ksr_unlimited(servers):
     # - check rndc dnssec -status output
     isctest.kasp.check_dnssecstatus(ns1, zone, zsks, policy=policy)
     # - zone is signed
-    isctest.kasp.zone_is_signed(ns1, zone)
+    isctest.kasp.check_zone_is_signed(ns1, zone)
     # - dnssec_verify
-    isctest.kasp.dnssec_verify(ns1, zone)
+    isctest.kasp.check_dnssec_verify(ns1, zone)
     # - check keys
     check_keys(zsks, lifetime, alg, size, with_state=True)
     # - check apex
@@ -1039,9 +1039,9 @@ def test_ksr_twotone(servers):
     # - check rndc dnssec -status output
     isctest.kasp.check_dnssecstatus(ns1, zone, zsks, policy=policy)
     # - zone is signed
-    isctest.kasp.zone_is_signed(ns1, zone)
+    isctest.kasp.check_zone_is_signed(ns1, zone)
     # - dnssec_verify
-    isctest.kasp.dnssec_verify(ns1, zone)
+    isctest.kasp.check_dnssec_verify(ns1, zone)
     # - check keys
     alg = os.environ.get("DEFAULT_ALGORITHM_NUMBER")
     size = os.environ.get("DEFAULT_BITS")