Merge pull request #9223 from mind04/pdns-supersomething

[thirdparty/pdns.git] / regression-tests.dnsdist / test_CheckConfig.py

diff --git a/regression-tests.dnsdist/test_CheckConfig.py b/regression-tests.dnsdist/test_CheckConfig.py
index eaed2bc84f4a83ffeaa431782f9381dc0858d5a2..835d7ae8dd5b016d0edef6e1af9f87555d97b8dc 100644 (file)
--- a/regression-tests.dnsdist/test_CheckConfig.py
+++ b/regression-tests.dnsdist/test_CheckConfig.py
@@ -2,7 +2,6 @@
 import unittest
 import os
 import subprocess
-import sys
 import time
 
 class TestCheckConfig(unittest.TestCase):
@@ -34,21 +33,16 @@ class TestCheckConfig(unittest.TestCase):
         configTemplate = """
             newServer{address="127.0.0.1:53"}
             truncateTC(true)
-            addAnyTCRule()
-            addAction(RegexRule("evil[0-9]{4,}\\\\.regex\\\\.tests\\\\.powerdns\\\\.com$"), RCodeAction(5))
+            addAction(AndRule{QTypeRule(DNSQType.ANY), TCPRule(false)}, TCAction())
+            addAction(RegexRule("evil[0-9]{4,}\\\\.regex\\\\.tests\\\\.powerdns\\\\.com$"), RCodeAction(DNSRCode.REFUSED))
             mySMN = newSuffixMatchNode()
             mySMN:add(newDNSName("nameAndQtype.tests.powerdns.com."))
-            addAction(AndRule{SuffixMatchNodeRule(mySMN), QTypeRule("TXT")}, RCodeAction(4))
+            mySMN:add("string.smn.tests.powerdns.com.")
+            mySMN:add("string-no-dot.smn.tests.powerdns.com")
+            mySMN:add({"string-one.smn.tests.powerdns.com", "string-two.smn.tests.powerdns.com"})
+            mySMN:add({newDNSName("dnsname-one.smn.tests.powerdns.com"), newDNSName("dnsname-two.smn.tests.powerdns.com")})
+            addAction(AndRule{SuffixMatchNodeRule(mySMN), QTypeRule("TXT")}, RCodeAction(DNSRCode.NOTIMP))
             addAction(makeRule("drop.test.powerdns.com."), DropAction())
-            block=newDNSName("powerdns.org.")
-            function blockFilter(dq)
-                if(dq.qname:isPartOf(block))
-                then
-                    print("Blocking *.powerdns.org")
-                    return true
-                end
-                return false
-            end
         """
 
         self.tryDNSDist(configTemplate)