Fix bugs in isctest.kasp

isctest.util was not imported so file_contents_contain could not be
found. And rename verify_keys to check_keys because it asserts in
isctest.run.retry_with_timeout.

(cherry picked from commit 62a6b9faa7ccf85b2b628fb991c8f72d2976eee3)

diff --git a/bin/tests/system/isctest/kasp.py b/bin/tests/system/isctest/kasp.py
index 2ade4dafbea6c1a65860ff80c8aac19c0941cc70..0ea1c774ea6e92c061149eb5db85fc2686b31cc4 100644 (file)
--- a/bin/tests/system/isctest/kasp.py
+++ b/bin/tests/system/isctest/kasp.py
@@ -24,6 +24,7 @@ import dns
 import dns.tsig
 import isctest.log
 import isctest.query
+import isctest.util
 
 DEFAULT_TTL = 300
 
@@ -612,7 +613,7 @@ def check_zone_is_signed(server, zone, tsig=None):
     assert signed
 
 
-def verify_keys(zone, keys, expected):
+def check_keys(zone, keys, expected):
     """
     Checks keys for a configured zone. This verifies:
     1. The expected number of keys exist in 'keys'.