]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
dnsdist: Fix EDNS tests on self-generated answers for TC over TCP 10695/head
authorRemi Gacogne <remi.gacogne@powerdns.com>
Tue, 7 Sep 2021 15:30:30 +0000 (17:30 +0200)
committerRemi Gacogne <remi.gacogne@powerdns.com>
Tue, 7 Sep 2021 15:30:30 +0000 (17:30 +0200)
regression-tests.dnsdist/test_EDNSSelfGenerated.py

index 2868f4c97f62e9f846a5b04a4f7926089059b67e..f1ee0aec1ddcb87aed5a9b5208b149f7beff7407 100644 (file)
@@ -49,10 +49,8 @@ class TestEDNSSelfGenerated(DNSDistTest):
         expectedResponse = dns.message.make_response(query)
         expectedResponse.flags |= dns.flags.TC
 
-        for method in ("sendUDPQuery", "sendTCPQuery"):
-            sender = getattr(self, method)
-            (_, receivedResponse) = sender(query, response=None, useQueue=False)
-            self.checkMessageNoEDNS(expectedResponse, receivedResponse)
+        (_, receivedResponse) = self.sendUDPQuery(query, response=None, useQueue=False)
+        self.checkMessageNoEDNS(expectedResponse, receivedResponse)
 
         name = 'no-edns.lua.edns-self.tests.powerdns.com.'
         query = dns.message.make_query(name, 'A', 'IN')
@@ -104,12 +102,10 @@ class TestEDNSSelfGenerated(DNSDistTest):
         expectedResponse = dns.message.make_response(query, our_payload=1042)
         expectedResponse.flags |= dns.flags.TC
 
-        for method in ("sendUDPQuery", "sendTCPQuery"):
-            sender = getattr(self, method)
-            (_, receivedResponse) = sender(query, response=None, useQueue=False)
-            self.checkMessageEDNSWithoutOptions(expectedResponse, receivedResponse)
-            self.assertFalse(receivedResponse.ednsflags & dns.flags.DO)
-            self.assertEqual(receivedResponse.payload, 1042)
+        (_, receivedResponse) = self.sendUDPQuery(query, response=None, useQueue=False)
+        self.checkMessageEDNSWithoutOptions(expectedResponse, receivedResponse)
+        self.assertFalse(receivedResponse.ednsflags & dns.flags.DO)
+        self.assertEqual(receivedResponse.payload, 1042)
 
         name = 'edns-no-do.lua.edns-self.tests.powerdns.com.'
         query = dns.message.make_query(name, 'A', 'IN', use_edns=True, payload=4096, want_dnssec=False)
@@ -165,12 +161,10 @@ class TestEDNSSelfGenerated(DNSDistTest):
         expectedResponse = dns.message.make_response(query, our_payload=1042)
         expectedResponse.flags |= dns.flags.TC
 
-        for method in ("sendUDPQuery", "sendTCPQuery"):
-            sender = getattr(self, method)
-            (_, receivedResponse) = sender(query, response=None, useQueue=False)
-            self.checkMessageEDNSWithoutOptions(expectedResponse, receivedResponse)
-            self.assertTrue(receivedResponse.ednsflags & dns.flags.DO)
-            self.assertEqual(receivedResponse.payload, 1042)
+        (_, receivedResponse) = self.sendUDPQuery(query, response=None, useQueue=False)
+        self.checkMessageEDNSWithoutOptions(expectedResponse, receivedResponse)
+        self.assertTrue(receivedResponse.ednsflags & dns.flags.DO)
+        self.assertEqual(receivedResponse.payload, 1042)
 
         name = 'edns-do.lua.edns-self.tests.powerdns.com.'
         query = dns.message.make_query(name, 'A', 'IN', use_edns=True, payload=4096, want_dnssec=True)
@@ -227,12 +221,10 @@ class TestEDNSSelfGenerated(DNSDistTest):
         expectedResponse = dns.message.make_response(query, our_payload=1042)
         expectedResponse.flags |= dns.flags.TC
 
-        for method in ("sendUDPQuery", "sendTCPQuery"):
-            sender = getattr(self, method)
-            (_, receivedResponse) = sender(query, response=None, useQueue=False)
-            self.checkMessageEDNSWithoutOptions(expectedResponse, receivedResponse)
-            self.assertTrue(receivedResponse.ednsflags & dns.flags.DO)
-            self.assertEqual(receivedResponse.payload, 1042)
+        (_, receivedResponse) = self.sendUDPQuery(query, response=None, useQueue=False)
+        self.checkMessageEDNSWithoutOptions(expectedResponse, receivedResponse)
+        self.assertTrue(receivedResponse.ednsflags & dns.flags.DO)
+        self.assertEqual(receivedResponse.payload, 1042)
 
         name = 'edns-options.lua.edns-self.tests.powerdns.com.'
         query = dns.message.make_query(name, 'A', 'IN', use_edns=True, options=[ecso], payload=512, want_dnssec=True)
@@ -312,10 +304,8 @@ class TestEDNSSelfGeneratedDisabled(DNSDistTest):
         expectedResponse = dns.message.make_response(query)
         expectedResponse.flags |= dns.flags.TC
 
-        for method in ("sendUDPQuery", "sendTCPQuery"):
-            sender = getattr(self, method)
-            (_, receivedResponse) = sender(query, response=None, useQueue=False)
-            self.checkMessageNoEDNS(expectedResponse, receivedResponse)
+        (_, receivedResponse) = self.sendUDPQuery(query, response=None, useQueue=False)
+        self.checkMessageNoEDNS(expectedResponse, receivedResponse)
 
         name = 'edns-no-do.lua.edns-self-disabled.tests.powerdns.com.'
         query = dns.message.make_query(name, 'A', 'IN', use_edns=True, payload=4096, want_dnssec=False)