From 5284dfd4fefdd04c2e605090c90f118269c267ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Bal=C3=A1=C5=BEik?= Date: Wed, 17 Dec 2025 14:08:03 +0100 Subject: [PATCH] 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. (cherry picked from commit 7e587201a4e49c88cfb4a46662d819c3a35b703b) --- bin/tests/system/chain/ans3/ans.py | 2 +- bin/tests/system/cookie/cookie_ans.py | 14 ++++++-------- bin/tests/system/digdelv/ans7/ans.py | 8 +++----- bin/tests/system/dnssec/ans10/ans.py | 2 +- bin/tests/system/isctest/asyncserver.py | 4 ++-- bin/tests/system/qmin/ans2/ans.py | 12 +++++------- bin/tests/system/qmin/ans3/ans.py | 10 ++++------ bin/tests/system/qmin/ans4/ans.py | 12 +++++------- bin/tests/system/rpzrecurse/ans5/ans.py | 2 +- bin/tests/system/statistics/ans4/ans.py | 20 +++++++++----------- 10 files changed, 37 insertions(+), 49 deletions(-) diff --git a/bin/tests/system/chain/ans3/ans.py b/bin/tests/system/chain/ans3/ans.py index b61cd9d79a..2b0c41ccb7 100755 --- 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 50b06f2c16..72f0e0ab46 100644 --- 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 d959b597e2..768c01e224 100644 --- 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 f69d5ebe14..d5d22e621e 100644 --- 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 86de57cf71..1eaf2a4ec7 100644 --- 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 e4f7611f64..4708dc6cf1 100644 --- 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 101ea2a14f..ec720fd228 100644 --- 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 74b9d9fa80..b766017de0 100644 --- 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 3132fca091..6eed86d7f4 100644 --- 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 a5aa118ade..0a9d05e1b8 100644 --- 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()