Use variadic positional parameters for plural install_* methods

It saves an indent and brackets on the call sites.

Also sort the handlers alphabetically where their order doesn't matter
and split the fallback handlers into a separate call to signify that
their position in the end matters.

diff --git a/bin/tests/system/chain/ans3/ans.py b/bin/tests/system/chain/ans3/ans.py
index b61cd9d79a5dc13b62f03db638902282c8f0a3fd..2b0c41ccb73aad7c2bae3e7627998fb6fe0e75d3 100755 (executable)
--- a/bin/tests/system/chain/ans3/ans.py
+++ b/bin/tests/system/chain/ans3/ans.py
@@ -114,7 +114,7 @@ class Cve202125215(DomainHandler):
 
 def main() -> None:
     server = AsyncDnsServer(acknowledge_manual_dname_handling=True, default_aa=True)
-    server.install_response_handlers([CnameThenDnameHandler(), Cve202125215()])
+    server.install_response_handlers(CnameThenDnameHandler(), Cve202125215())
     server.run()
 
 

diff --git a/bin/tests/system/cookie/cookie_ans.py b/bin/tests/system/cookie/cookie_ans.py
index 50b06f2c16151053c407dac86aa54f8a22f2c855..72f0e0ab4670bd13870fdd29c87ac4f5add6d78f 100644 (file)
--- a/bin/tests/system/cookie/cookie_ans.py
+++ b/bin/tests/system/cookie/cookie_ans.py
@@ -194,13 +194,11 @@ def cookie_server(evil: bool) -> AsyncDnsServer:
         keyring=KEYRING, default_aa=True, default_rcode=dns.rcode.NOERROR
     )
     server.install_response_handlers(
-        [
-            NsHandler(evil),
-            GlueHandler(evil),
-            TcpAHandler(),
-            WithtsigUdpAHandler(),
-            UdpAHandler(),
-            FallbackHandler(),
-        ]
+        NsHandler(evil),
+        GlueHandler(evil),
+        TcpAHandler(),
+        WithtsigUdpAHandler(),
+        UdpAHandler(),
     )
+    server.install_response_handler(FallbackHandler())
     return server

diff --git a/bin/tests/system/digdelv/ans7/ans.py b/bin/tests/system/digdelv/ans7/ans.py
index d959b597e23eb451b13989efe315a433ee9b15ed..768c01e2249e1d0cf6e0a85492d7a48f4e7ed8e1 100644 (file)
--- a/bin/tests/system/digdelv/ans7/ans.py
+++ b/bin/tests/system/digdelv/ans7/ans.py
@@ -63,11 +63,9 @@ class SilentThenServfailHandler(DomainHandler):
 def main() -> None:
     server = AsyncDnsServer()
     server.install_response_handlers(
-        [
-            CloseHandler(),
-            SilentHandler(),
-            SilentThenServfailHandler(),
-        ]
+        CloseHandler(),
+        SilentHandler(),
+        SilentThenServfailHandler(),
     )
     server.run()
 

diff --git a/bin/tests/system/dnssec/ans10/ans.py b/bin/tests/system/dnssec/ans10/ans.py
index f69d5ebe1489279f5aaab099c3e8f3894e9fac2d..d5d22e621e29f356e3326e0317d80a8df93cbb61 100644 (file)
--- a/bin/tests/system/dnssec/ans10/ans.py
+++ b/bin/tests/system/dnssec/ans10/ans.py
@@ -57,7 +57,7 @@ class AddNsecToTxtHandler(ResponseHandler):
 
 def main() -> None:
     server = AsyncDnsServer()
-    server.install_response_handlers([AddRrsigToAHandler(), AddNsecToTxtHandler()])
+    server.install_response_handlers(AddNsecToTxtHandler(), AddRrsigToAHandler())
     server.run()
 
 

diff --git a/bin/tests/system/isctest/asyncserver.py b/bin/tests/system/isctest/asyncserver.py
index 86de57cf71cb71d5cf0d2fdb5dbcc91db4d86a3c..1eaf2a4ec7cfdf3dff9b62326a78248a2445a003 100644 (file)
--- a/bin/tests/system/isctest/asyncserver.py
+++ b/bin/tests/system/isctest/asyncserver.py
@@ -887,7 +887,7 @@ class AsyncDnsServer(AsyncServer):
         else:
             self._response_handlers.append(handler)
 
-    def install_response_handlers(self, handlers: List[ResponseHandler]) -> None:
+    def install_response_handlers(self, *handlers: ResponseHandler) -> None:
         for handler in handlers:
             self.install_response_handler(handler)
 
@@ -1380,7 +1380,7 @@ class ControllableAsyncDnsServer(AsyncDnsServer):
     def _commands(self) -> Dict[dns.name.Name, "ControlCommand"]:
         return {}
 
-    def install_control_commands(self, commands: List["ControlCommand"]) -> None:
+    def install_control_commands(self, *commands: "ControlCommand") -> None:
         for command in commands:
             self.install_control_command(command)
 

diff --git a/bin/tests/system/qmin/ans2/ans.py b/bin/tests/system/qmin/ans2/ans.py
index e4f7611f64556195537ab44e2141887b66d80bf1..4708dc6cf12fbe3842e387fd9d67f89476bff466 100644 (file)
--- a/bin/tests/system/qmin/ans2/ans.py
+++ b/bin/tests/system/qmin/ans2/ans.py
@@ -100,13 +100,11 @@ class StaleHandler(DomainHandler):
 def main() -> None:
     server = AsyncDnsServer()
     server.install_response_handlers(
-        [
-            QueryLogger(),
-            BadHandler(),
-            UglyHandler(),
-            SlowHandler(),
-            StaleHandler(),
-        ]
+        QueryLogger(),
+        BadHandler(),
+        UglyHandler(),
+        SlowHandler(),
+        StaleHandler(),
     )
     server.run()
 

diff --git a/bin/tests/system/qmin/ans3/ans.py b/bin/tests/system/qmin/ans3/ans.py
index 101ea2a14f687da6f8f510dc6d578cd9229233ad..ec720fd228b35089224c99a11fa576d0ec571d98 100644 (file)
--- a/bin/tests/system/qmin/ans3/ans.py
+++ b/bin/tests/system/qmin/ans3/ans.py
@@ -40,12 +40,10 @@ class ZoopBoingSlowHandler(DelayedResponseHandler):
 def main() -> None:
     server = AsyncDnsServer()
     server.install_response_handlers(
-        [
-            QueryLogger(),
-            ZoopBoingBadHandler(),
-            ZoopBoingUglyHandler(),
-            ZoopBoingSlowHandler(),
-        ]
+        QueryLogger(),
+        ZoopBoingBadHandler(),
+        ZoopBoingUglyHandler(),
+        ZoopBoingSlowHandler(),
     )
     server.run()
 

diff --git a/bin/tests/system/qmin/ans4/ans.py b/bin/tests/system/qmin/ans4/ans.py
index 74b9d9fa80701da330a9982a729993c2bb60c83e..b766017de0a287ccead66cbe61c1daaf49ccedb4 100644 (file)
--- a/bin/tests/system/qmin/ans4/ans.py
+++ b/bin/tests/system/qmin/ans4/ans.py
@@ -87,13 +87,11 @@ class IckyPtangZoopBoingSlowHandler(DelayedResponseHandler):
 def main() -> None:
     server = AsyncDnsServer()
     server.install_response_handlers(
-        [
-            QueryLogger(),
-            StaleHandler(),
-            IckyPtangZoopBoingBadHandler(),
-            IckyPtangZoopBoingUglyHandler(),
-            IckyPtangZoopBoingSlowHandler(),
-        ]
+        QueryLogger(),
+        StaleHandler(),
+        IckyPtangZoopBoingBadHandler(),
+        IckyPtangZoopBoingUglyHandler(),
+        IckyPtangZoopBoingSlowHandler(),
     )
     server.run()
 

diff --git a/bin/tests/system/rpzrecurse/ans5/ans.py b/bin/tests/system/rpzrecurse/ans5/ans.py
index 3132fca0918d7ed4442684004545d118c17546e2..6eed86d7f4515ab23e32f4c21fbcc051ff29d6ea 100644 (file)
--- a/bin/tests/system/rpzrecurse/ans5/ans.py
+++ b/bin/tests/system/rpzrecurse/ans5/ans.py
@@ -52,7 +52,7 @@ class IgnoreNs(ResponseHandler):
 
 def main() -> None:
     server = AsyncDnsServer(default_aa=True, default_rcode=dns.rcode.NOERROR)
-    server.install_response_handlers([ReplyA(), IgnoreNs()])
+    server.install_response_handlers(ReplyA(), IgnoreNs())
     server.run()
 
 

diff --git a/bin/tests/system/statistics/ans4/ans.py b/bin/tests/system/statistics/ans4/ans.py
index a5aa118ade15028af955e1000391e61f175d11f5..0a9d05e1b86660d11a4dd82b306186e054e68718 100644 (file)
--- a/bin/tests/system/statistics/ans4/ans.py
+++ b/bin/tests/system/statistics/ans4/ans.py
@@ -162,18 +162,16 @@ class FallbackHandler(ResponseHandler):
 def main() -> None:
     server = AsyncDnsServer(default_rcode=dns.rcode.NOERROR)
     server.install_response_handlers(
-        [
-            BadGoodCnameHandler(),
-            Cname1Handler(),
-            Cname2Handler(),
-            ExampleHandler(),
-            FooInfoHandler(),
-            NoDataHandler(),
-            NxdomainHandler(),
-            SubHandler(),
-            FallbackHandler(),
-        ]
+        BadGoodCnameHandler(),
+        Cname1Handler(),
+        Cname2Handler(),
+        ExampleHandler(),
+        FooInfoHandler(),
+        NoDataHandler(),
+        NxdomainHandler(),
+        SubHandler(),
     )
+    server.install_response_handler(FallbackHandler())
     server.run()