From: Štěpán Balážik <stepan@isc.org>
Date: Tue, 27 Jan 2026 20:29:07 +0000 (+0100)
Subject: Run custom servers as Python modules
X-Git-Tag: v9.21.19~15^2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=407df9599c56031163182896cd2f8e36df01223a;p=thirdparty%2Fbind9.git

Run custom servers as Python modules

Use `python -m` for running the custom servers.

This allows the use of relative imports in the server modules and in
turn linting the modules.
---

diff --git a/bin/tests/system/bailiwick/ans1/ans.py b/bin/tests/system/bailiwick/ans1/ans.py
index 859e77491f0..117a014e932 100644
--- a/bin/tests/system/bailiwick/ans1/ans.py
+++ b/bin/tests/system/bailiwick/ans1/ans.py
@@ -22,7 +22,7 @@ from isctest.asyncserver import (
     ResponseAction,
 )
 
-from bailiwick_ans import ResponseSpoofer, spoofing_server
+from ..bailiwick_ans import ResponseSpoofer, spoofing_server
 
 ATTACKER_IP = "10.53.0.3"
 TTL = 3600
diff --git a/bin/tests/system/bailiwick/ans2/ans.py b/bin/tests/system/bailiwick/ans2/ans.py
index 151a2c6ccce..8dfa0749c82 100644
--- a/bin/tests/system/bailiwick/ans2/ans.py
+++ b/bin/tests/system/bailiwick/ans2/ans.py
@@ -22,7 +22,7 @@ from isctest.asyncserver import (
     ResponseAction,
 )
 
-from bailiwick_ans import ResponseSpoofer, spoofing_server
+from ..bailiwick_ans import ResponseSpoofer, spoofing_server
 
 ATTACKER_IP = "10.53.0.3"
 TTL = 3600
diff --git a/bin/tests/system/cookie/ans10/ans.py b/bin/tests/system/cookie/ans10/ans.py
index 0be47f173b6..cada97ab57c 100644
--- a/bin/tests/system/cookie/ans10/ans.py
+++ b/bin/tests/system/cookie/ans10/ans.py
@@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-from cookie_ans import cookie_server
+from ..cookie_ans import cookie_server
 
 
 def main() -> None:
diff --git a/bin/tests/system/cookie/ans9/ans.py b/bin/tests/system/cookie/ans9/ans.py
index 5c9b07f4ff6..21836d97af2 100644
--- a/bin/tests/system/cookie/ans9/ans.py
+++ b/bin/tests/system/cookie/ans9/ans.py
@@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-from cookie_ans import cookie_server
+from ..cookie_ans import cookie_server
 
 
 def main() -> None:
diff --git a/bin/tests/system/qmin/ans2/ans.py b/bin/tests/system/qmin/ans2/ans.py
index 4708dc6cf12..20172a87b6c 100644
--- a/bin/tests/system/qmin/ans2/ans.py
+++ b/bin/tests/system/qmin/ans2/ans.py
@@ -27,7 +27,7 @@ from isctest.asyncserver import (
     ResponseAction,
 )
 
-from qmin_ans import (
+from ..qmin_ans import (
     DelayedResponseHandler,
     EntRcodeChanger,
     QueryLogHandler,
diff --git a/bin/tests/system/qmin/ans3/ans.py b/bin/tests/system/qmin/ans3/ans.py
index ec720fd228b..5d4e7edca4c 100644
--- a/bin/tests/system/qmin/ans3/ans.py
+++ b/bin/tests/system/qmin/ans3/ans.py
@@ -15,7 +15,7 @@ import dns.rcode
 
 from isctest.asyncserver import AsyncDnsServer
 
-from qmin_ans import DelayedResponseHandler, EntRcodeChanger, QueryLogHandler
+from ..qmin_ans import DelayedResponseHandler, EntRcodeChanger, QueryLogHandler
 
 
 class QueryLogger(QueryLogHandler):
diff --git a/bin/tests/system/qmin/ans4/ans.py b/bin/tests/system/qmin/ans4/ans.py
index b766017de0a..08286a4bba1 100644
--- a/bin/tests/system/qmin/ans4/ans.py
+++ b/bin/tests/system/qmin/ans4/ans.py
@@ -24,7 +24,12 @@ from isctest.asyncserver import (
     ResponseAction,
 )
 
-from qmin_ans import DelayedResponseHandler, EntRcodeChanger, QueryLogHandler, log_query
+from ..qmin_ans import (
+    DelayedResponseHandler,
+    EntRcodeChanger,
+    QueryLogHandler,
+    log_query,
+)
 
 
 class QueryLogger(QueryLogHandler):
diff --git a/bin/tests/system/resolver/ans10/ans.py b/bin/tests/system/resolver/ans10/ans.py
index 1edb75db9e7..e2810e9252e 100644
--- a/bin/tests/system/resolver/ans10/ans.py
+++ b/bin/tests/system/resolver/ans10/ans.py
@@ -21,7 +21,7 @@ from isctest.asyncserver import (
     ResponseHandler,
 )
 
-from resolver_ans import rrset, soa_rrset
+from ..resolver_ans import rrset, soa_rrset
 
 
 class EdnsWithOptionsFormerrHandler(ResponseHandler):
diff --git a/bin/tests/system/resolver/ans2/ans.py b/bin/tests/system/resolver/ans2/ans.py
index 74195b00ccc..9f1be141b4b 100644
--- a/bin/tests/system/resolver/ans2/ans.py
+++ b/bin/tests/system/resolver/ans2/ans.py
@@ -31,7 +31,7 @@ from isctest.asyncserver import (
     ResponseHandler,
 )
 
-from resolver_ans import (
+from ..resolver_ans import (
     DelegationHandler,
     Gl6412AHandler,
     Gl6412Handler,
diff --git a/bin/tests/system/resolver/ans3/ans.py b/bin/tests/system/resolver/ans3/ans.py
index bd21c9d4f71..f3143f512dc 100644
--- a/bin/tests/system/resolver/ans3/ans.py
+++ b/bin/tests/system/resolver/ans3/ans.py
@@ -29,7 +29,7 @@ from isctest.asyncserver import (
     ResponseHandler,
 )
 
-from resolver_ans import (
+from ..resolver_ans import (
     DelegationHandler,
     Gl6412AHandler,
     Gl6412Handler,
diff --git a/bin/tests/system/resolver/ans8/ans.py b/bin/tests/system/resolver/ans8/ans.py
index 25eac4247f6..7d677265fac 100644
--- a/bin/tests/system/resolver/ans8/ans.py
+++ b/bin/tests/system/resolver/ans8/ans.py
@@ -32,7 +32,7 @@ from isctest.asyncserver import (
     StaticResponseHandler,
 )
 
-from resolver_ans import rrset
+from ..resolver_ans import rrset
 
 
 class HeaderOnlyHandler(ResponseHandler):
diff --git a/bin/tests/system/start.pl b/bin/tests/system/start.pl
index 79757fc0a7e..81b228e23e0 100755
--- a/bin/tests/system/start.pl
+++ b/bin/tests/system/start.pl
@@ -325,7 +325,7 @@ sub construct_ans_command {
 
 	if (-e "$testdir/$server/ans.py") {
 		$ENV{'PYTHONPATH'} = $testdir . ":" . $srcdir;
-		$command = "$PYTHON -u ans.py 10.53.0.$n $queryport";
+		$command = "$PYTHON -u -m $test.$server.ans 10.53.0.$n $queryport";
 	} elsif (-e "$testdir/$server/ans.pl") {
 		$command = "$PERL ans.pl";
 	} else {