From: Charles-Henri Bruyand <charles-henri.bruyand@open-xchange.com>
Date: Wed, 6 Oct 2021 09:18:43 +0000 (+0200)
Subject: dnsdist tests: remove redundant tests
X-Git-Tag: dnsdist-1.7.0-alpha2~35^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10812%2Fhead;p=thirdparty%2Fpdns.git

dnsdist tests: remove redundant tests
---

diff --git a/regression-tests.dnsdist/test_Advanced.py b/regression-tests.dnsdist/test_Advanced.py
index 13120564b5..d55212d791 100644
--- a/regression-tests.dnsdist/test_Advanced.py
+++ b/regression-tests.dnsdist/test_Advanced.py
@@ -162,7 +162,6 @@ class TestAdvancedAddCD(DNSDistTest):
 
     _config_template = """
     addAction("setcd.advanced.tests.powerdns.com.", SetDisableValidationAction())
-    addAction(makeRule("setcdviaaction.advanced.tests.powerdns.com."), SetDisableValidationAction())
     newServer{address="127.0.0.1:%s"}
     """
 
@@ -195,35 +194,6 @@ class TestAdvancedAddCD(DNSDistTest):
             self.assertEqual(expectedQuery, receivedQuery)
             self.assertEqual(response, receivedResponse)
 
-    def testAdvancedSetCDViaAction(self):
-        """
-        Advanced: Set CD via Action
-
-        Send a query with CD cleared,
-        check that dnsdist set the CD flag.
-        """
-        name = 'setcdviaaction.advanced.tests.powerdns.com.'
-        query = dns.message.make_query(name, 'A', 'IN')
-        expectedQuery = dns.message.make_query(name, 'A', 'IN')
-        expectedQuery.flags |= dns.flags.CD
-
-        response = dns.message.make_response(query)
-        rrset = dns.rrset.from_text(name,
-                                    3600,
-                                    dns.rdataclass.IN,
-                                    dns.rdatatype.A,
-                                    '127.0.0.1')
-        response.answer.append(rrset)
-
-        for method in ("sendUDPQuery", "sendTCPQuery"):
-            sender = getattr(self, method)
-            (receivedQuery, receivedResponse) = sender(query, response)
-            self.assertTrue(receivedQuery)
-            self.assertTrue(receivedResponse)
-            receivedQuery.id = expectedQuery.id
-            self.assertEqual(expectedQuery, receivedQuery)
-            self.assertEqual(response, receivedResponse)
-
     def testAdvancedKeepNoCD(self):
         """
         Advanced: Preserve CD canary
@@ -255,7 +225,6 @@ class TestAdvancedClearRD(DNSDistTest):
 
     _config_template = """
     addAction("clearrd.advanced.tests.powerdns.com.", SetNoRecurseAction())
-    addAction(makeRule("clearrdviaaction.advanced.tests.powerdns.com."), SetNoRecurseAction())
     newServer{address="127.0.0.1:%s"}
     """
 
@@ -288,35 +257,6 @@ class TestAdvancedClearRD(DNSDistTest):
             self.assertEqual(expectedQuery, receivedQuery)
             self.assertEqual(response, receivedResponse)
 
-    def testAdvancedClearRDViaAction(self):
-        """
-        Advanced: Clear RD via Action
-
-        Send a query with RD set,
-        check that dnsdist clears the RD flag.
-        """
-        name = 'clearrdviaaction.advanced.tests.powerdns.com.'
-        query = dns.message.make_query(name, 'A', 'IN')
-        expectedQuery = dns.message.make_query(name, 'A', 'IN')
-        expectedQuery.flags &= ~dns.flags.RD
-
-        response = dns.message.make_response(query)
-        rrset = dns.rrset.from_text(name,
-                                    3600,
-                                    dns.rdataclass.IN,
-                                    dns.rdatatype.A,
-                                    '127.0.0.1')
-        response.answer.append(rrset)
-
-        for method in ("sendUDPQuery", "sendTCPQuery"):
-            sender = getattr(self, method)
-            (receivedQuery, receivedResponse) = sender(query, response)
-            self.assertTrue(receivedQuery)
-            self.assertTrue(receivedResponse)
-            receivedQuery.id = expectedQuery.id
-            self.assertEqual(expectedQuery, receivedQuery)
-            self.assertEqual(response, receivedResponse)
-
     def testAdvancedKeepRD(self):
         """
         Advanced: Preserve RD canary