Rename assert_custom_named_is_alive to named_alive

diff --git a/bin/tests/system/isctest/check.py b/bin/tests/system/isctest/check.py
index cfc8d92ceeabe39f5b8429ff05d81e4b567aad86..0906ad92ff7bae6b233c430fb4067d05b0f0f3e5 100644 (file)
--- a/bin/tests/system/isctest/check.py
+++ b/bin/tests/system/isctest/check.py
@@ -102,6 +102,12 @@ def is_executable(cmd: str, errmsg: str) -> None:
     assert executable is not None, errmsg
 
 
+def named_alive(named_proc, resolver_ip):
+    assert named_proc.poll() is None, "named isn't running"
+    msg = dns.message.make_query("version.bind", "TXT", "CH")
+    isctest.query.tcp(msg, resolver_ip, expected_rcode=dns_rcode.NOERROR)
+
+
 def notauth(message: dns.message.Message) -> None:
     rcode(message, dns.rcode.NOTAUTH)
 

diff --git a/bin/tests/system/isctest/run.py b/bin/tests/system/isctest/run.py
index 49176d7a8827a7d744c79514bb795ddf4831fca2..eed356bbb5d0bb2d3415e791fa9489ba26b85fa9 100644 (file)
--- a/bin/tests/system/isctest/run.py
+++ b/bin/tests/system/isctest/run.py
@@ -132,9 +132,3 @@ def get_named_cmdline(cfg_dir, cfg_file="named.conf"):
     named_cmdline = [named, "-c", cfg_file, "-d", "99", "-g"]
 
     return named_cmdline
-
-
-def assert_custom_named_is_alive(named_proc, resolver_ip):
-    assert named_proc.poll() is None, "named isn't running"
-    msg = dns.message.make_query("version.bind", "TXT", "CH")
-    isctest.query.tcp(msg, resolver_ip, expected_rcode=dns_rcode.NOERROR)

diff --git a/bin/tests/system/shutdown/tests_shutdown.py b/bin/tests/system/shutdown/tests_shutdown.py
index 99929be93a1de54ce56edbb4c4b5f980fc791c2e..bbfab34cc4f78ca93ce2d7faac0e24cb0020445a 100755 (executable)
--- a/bin/tests/system/shutdown/tests_shutdown.py
+++ b/bin/tests/system/shutdown/tests_shutdown.py
@@ -177,7 +177,7 @@ def test_named_shutdown(kill_method):
             named_cmdline, cwd=cfg_dir, stderr=named_log
         ) as named_proc:
             try:
-                isctest.run.assert_custom_named_is_alive(named_proc, resolver_ip)
+                isctest.check.named_alive(named_proc, resolver_ip)
                 do_work(
                     named_proc,
                     resolver_ip,