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 859e77491f09fbb0ad9e1c90cb566c18a337cccc..117a014e93286e68fc7f25d0b33f4f54b71672d7 100644 (file)
--- 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 151a2c6cccea2f2c35eb2508f82cabbbd8675b63..8dfa0749c823cae249b71d60cf8a04fc3b7dad99 100644 (file)
--- 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 0be47f173b6bc9c3fa07150d1677fde0d2f1fedd..cada97ab57cece1e34783af47991676664fc2197 100644 (file)
--- 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 5c9b07f4ff66697664bfdf185bc4724056a02ed6..21836d97af2866b3a1c1018fedf1f4ea55581e60 100644 (file)
--- 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 4708dc6cf12fbe3842e387fd9d67f89476bff466..20172a87b6c829ed2673d55d9443f63ab9bce57d 100644 (file)
--- 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 ec720fd228b35089224c99a11fa576d0ec571d98..5d4e7edca4c201a59e6974d477f02f13c2f223ea 100644 (file)
--- 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 b766017de0a287ccead66cbe61c1daaf49ccedb4..08286a4bba1b925d6239094a7dbfe6e7345511af 100644 (file)
--- 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 1edb75db9e784faf5eab06791b6d4a46062f7a98..e2810e9252e8f49a62c71414b17a053e7d9b3b09 100644 (file)
--- 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 74195b00ccc4a821415d7370b3a4980b794d6c8c..9f1be141b4bb8fca17a6b323b238643d921e5866 100644 (file)
--- 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 bd21c9d4f717583f954f7b1a11259516f63a9c2a..f3143f512dc340fd3d5645a33dced418aa232b28 100644 (file)
--- 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 25eac4247f6fb12143f7aae1f2e62d68c30bd0a5..7d677265faca5b105862dfb07ed30120e9d2e819 100644 (file)
--- 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 79757fc0a7e34fde22982df8757690125b3447b9..81b228e23e0668dc590a9a099bcbfc2c5c626631 100755 (executable)
--- 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 {