From 6ad854d206e060ec503f44c1dbb88c73103c1186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Thu, 21 May 2026 11:52:56 +0200 Subject: [PATCH] Follow common naming and coding conventions Make the handlers defined in bin/tests/system/resend_loop/ans3/ans.py follow canonical naming conventions used in other system tests. Keep all server initialization code in the main() function. (cherry picked from commit c5a30a722098f23c1fd3a7cd53de4d5164941dcd) --- bin/tests/system/resend_loop/ans3/ans.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/bin/tests/system/resend_loop/ans3/ans.py b/bin/tests/system/resend_loop/ans3/ans.py index ad23c82939..2423fe1314 100644 --- a/bin/tests/system/resend_loop/ans3/ans.py +++ b/bin/tests/system/resend_loop/ans3/ans.py @@ -37,14 +37,14 @@ def rrset( return dns.rrset.from_text(qname, ttl, dns.rdataclass.IN, rtype, rdata) -class RootNSHandler(QnameQtypeHandler, StaticResponseHandler): +class RootNsHandler(QnameQtypeHandler, StaticResponseHandler): qnames = ["."] qtypes = [dns.rdatatype.NS] answer = [rrset(".", dns.rdatatype.NS, "a.root-servers.nil.")] additional = [rrset("a.root-servers.nil.", dns.rdatatype.A, "10.53.0.3")] -class CookieHandler(DomainHandler): +class ExampleCookieHandler(DomainHandler): domains = ["example."] def _get_cookie(self, qctx: QueryContext) -> dns.edns.CookieOption | None: @@ -71,17 +71,13 @@ class CookieHandler(DomainHandler): yield DnsResponseSend(qctx.response) -def resend_server() -> AsyncDnsServer: +def main() -> None: server = AsyncDnsServer(default_aa=True, default_rcode=dns.rcode.NOERROR) server.install_response_handlers( - RootNSHandler(), - CookieHandler(), + RootNsHandler(), + ExampleCookieHandler(), ) - return server - - -def main() -> None: - resend_server().run() + server.run() if __name__ == "__main__":