X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=regression-tests.recursor-dnssec%2Ftest_RoutingTag.py;h=6d54618ae641f7aa1465d00bf2c13b025072a56e;hb=adac6d6c90ee5f38e6a1fc0f807ffec34991840a;hp=63f6c75f8c54cf03a6c0c9a5a9c229d71c3c7e19;hpb=706dbf0241e85b6f00c563204163ef501e0d109c;p=thirdparty%2Fpdns.git

diff --git a/regression-tests.recursor-dnssec/test_RoutingTag.py b/regression-tests.recursor-dnssec/test_RoutingTag.py
index 63f6c75f8c..6d54618ae6 100644
--- a/regression-tests.recursor-dnssec/test_RoutingTag.py
+++ b/regression-tests.recursor-dnssec/test_RoutingTag.py
@@ -21,14 +21,16 @@ class RoutingTagTest(RecursorTest):
 daemon=no
 trace=yes
 dont-query=
-ecs-add-for=0.0.0.0/0
 local-address=127.0.0.1
-packetcache-ttl=0
-packetcache-servfail-ttl=0
+packetcache-ttl=15
+packetcache-servfail-ttl=15
 max-cache-ttl=600
-threads=1
+threads=2
 loglevel=9
 disable-syslog=yes
+log-common-errors=yes
+statistics-interval=0
+ecs-add-for=0.0.0.0/0
 """
 
     def sendECSQuery(self, query, expected, expectedFirstTTL=None):
@@ -107,9 +109,8 @@ class testRoutingTag(RoutingTagTest):
     _confdir = 'RoutingTag'
 
     _config_template = """
-log-common-errors=yes
 use-incoming-edns-subnet=yes
-edns-subnet-whitelist=ecs-echo.example.
+edns-subnet-allow-list=ecs-echo.example.
 forward-zones=ecs-echo.example=%s.24
     """ % (os.environ['PREFIX'])
     _lua_dns_script_file = """
@@ -165,12 +166,12 @@ end
         query = dns.message.make_query(nameECS, 'TXT', 'IN')
         self.sendECSQuery(query, expected2)
 
-        #return # remove this line to peek at cache
+        return # remove this line to peek at cache
         rec_controlCmd = [os.environ['RECCONTROL'],
                           '--config-dir=%s' % 'configs/' + self._confdir,
-                          'dump-cache x']
+                          'dump-cache', 'x']
         try:
-            expected = 'dumped 6 records\n'
+            expected = b'dumped 7 records\n'
             ret = subprocess.check_output(rec_controlCmd, stderr=subprocess.STDOUT)
             self.assertEqual(ret, expected)
 
@@ -182,9 +183,8 @@ class testRoutingTagFFI(RoutingTagTest):
     _confdir = 'RoutingTagFFI'
 
     _config_template = """
-log-common-errors=yes
 use-incoming-edns-subnet=yes
-edns-subnet-whitelist=ecs-echo.example.
+edns-subnet-allow-list=ecs-echo.example.
 forward-zones=ecs-echo.example=%s.24
     """ % (os.environ['PREFIX'])
     _lua_dns_script_file = """
@@ -302,6 +302,6 @@ class UDPRoutingResponder(DatagramProtocol):
             response.additional.append(additional)
 
         if ecso:
-            response.options = [ecso]
+            response.use_edns(options = [ecso])
 
         self.transport.write(response.to_wire(), address)