Fix tests

diff --git a/regression-tests.recursor-dnssec/test_DNS64.py b/regression-tests.recursor-dnssec/test_DNS64.py
index 9ae3aefd4506a1f5415018712caae1f38fcec57e..5588a36ecb83924e82879f6a8853b44327bb7675 100644 (file)
--- a/regression-tests.recursor-dnssec/test_DNS64.py
+++ b/regression-tests.recursor-dnssec/test_DNS64.py
@@ -5,6 +5,11 @@ from recursortests import RecursorTest
 
 class DNS64RecursorTest(RecursorTest):
 
+    _auth_zones = {
+        '8': {'threads': 1,
+              'zones': ['ROOT']}
+    }
+
     _confdir = 'DNS64'
     _config_template = """
     auth-zones=example.dns64=configs/%s/example.dns64.zone
@@ -14,23 +19,6 @@ class DNS64RecursorTest(RecursorTest):
     dns64-prefix=64:ff9b::/96
     """ % (_confdir, _confdir, _confdir)
 
-    @classmethod
-    def setUpClass(cls):
-
-        # we don't need all the auth stuff
-        cls.setUpSockets()
-        cls.startResponders()
-
-        confdir = os.path.join('configs', cls._confdir)
-        cls.createConfigDir(confdir)
-
-        cls.generateRecursorConfig(confdir)
-        cls.startRecursor(confdir, cls._recursorPort)
-
-    @classmethod
-    def tearDownClass(cls):
-        cls.tearDownRecursor()
-
     @classmethod
     def generateRecursorConfig(cls, confdir):
         authzonepath = os.path.join(confdir, 'example.dns64.zone')

diff --git a/regression-tests.recursor-dnssec/test_PacketCache.py b/regression-tests.recursor-dnssec/test_PacketCache.py
index 7f282369e0e3e041eb6e956947eef754f8591648..dfcd8bc115973e6dc3e690fffb09464f2463973e 100644 (file)
--- a/regression-tests.recursor-dnssec/test_PacketCache.py
+++ b/regression-tests.recursor-dnssec/test_PacketCache.py
@@ -8,6 +8,11 @@ from recursortests import RecursorTest
 
 class PacketCacheRecursorTest(RecursorTest):
 
+    _auth_zones = {
+        '8': {'threads': 1,
+              'zones': ['ROOT']}
+    }
+
     _confdir = 'PacketCache'
     _wsPort = 8042
     _wsTimeout = 2
@@ -37,23 +42,6 @@ e 3600 IN A 192.0.2.42
 """.format(soa=cls._SOA))
         super(PacketCacheRecursorTest, cls).generateRecursorConfig(confdir)
 
-    @classmethod
-    def setUpClass(cls):
-
-        # we don't need all the auth stuff
-        cls.setUpSockets()
-        cls.startResponders()
-
-        confdir = os.path.join('configs', cls._confdir)
-        cls.createConfigDir(confdir)
-
-        cls.generateRecursorConfig(confdir)
-        cls.startRecursor(confdir, cls._recursorPort)
-
-    @classmethod
-    def tearDownClass(cls):
-        cls.tearDownRecursor()
-
     def checkPacketCacheMetrics(self, expectedHits, expectedMisses):
         headers = {'x-api-key': self._apiKey}
         url = 'http://127.0.0.1:' + str(self._wsPort) + '/api/v1/servers/localhost/statistics'

diff --git a/regression-tests.recursor-dnssec/test_Protobuf.py b/regression-tests.recursor-dnssec/test_Protobuf.py
index 805fab78a13372fddd82abd76d95bb020383d807..d26bf4381bed44e6b1329af8360084098cf7c1b4 100644 (file)
--- a/regression-tests.recursor-dnssec/test_Protobuf.py
+++ b/regression-tests.recursor-dnssec/test_Protobuf.py
@@ -79,6 +79,10 @@ class TestRecursorProtobuf(RecursorTest):
     protobufServer({"127.0.0.1:%d", "127.0.0.1:%d"})
     """ % (protobufServersParameters[0].port, protobufServersParameters[1].port)
 
+    _auth_zones = {
+        '8': {'threads': 1,
+              'zones': ['ROOT']}
+    }
 
     def getFirstProtobufMessage(self, retries=1, waitTime=1):
         msg = None
@@ -249,25 +253,13 @@ class TestRecursorProtobuf(RecursorTest):
         self.assertEquals(msg.deviceId, deviceId)
         self.assertEquals(msg.deviceName, deviceName)
 
-    @classmethod
-    def setUpClass(cls):
-
-        cls.setUpSockets()
-
-        cls.startResponders()
-
-        confdir = os.path.join('configs', cls._confdir)
-        cls.createConfigDir(confdir)
-
-        cls.generateRecursorConfig(confdir)
-        cls.startRecursor(confdir, cls._recursorPort)
-
     def setUp(self):
-      # Make sure the queue is empty, in case
-      # a previous test failed
-      for param in protobufServersParameters:
-        while not param.queue.empty():
-          param.queue.get(False)
+        super(TestRecursorProtobuf, self).setUp()
+        # Make sure the queue is empty, in case
+        # a previous test failed
+        for param in protobufServersParameters:
+            while not param.queue.empty():
+                param.queue.get(False)
 
     @classmethod
     def generateRecursorConfig(cls, confdir):
@@ -290,9 +282,6 @@ cname 3600 IN CNAME a.example.
 """.format(soa=cls._SOA))
         super(TestRecursorProtobuf, cls).generateRecursorConfig(confdir)
 
-    @classmethod
-    def tearDownClass(cls):
-        cls.tearDownRecursor()
 
 class ProtobufDefaultTest(TestRecursorProtobuf):
     """

diff --git a/regression-tests.recursor-dnssec/test_RPZ.py b/regression-tests.recursor-dnssec/test_RPZ.py
index 595215c6e11165956dac18bf0a5ffeda0290601b..5d3121df37759613d10950e87d70a924b70de113 100644 (file)
--- a/regression-tests.recursor-dnssec/test_RPZ.py
+++ b/regression-tests.recursor-dnssec/test_RPZ.py
@@ -221,6 +221,12 @@ class RPZRecursorTest(RecursorTest):
     _wsPassword = 'secretpassword'
     _apiKey = 'secretapikey'
     _confdir = 'RPZ'
+    _auth_zones = {
+        '8': {'threads': 1,
+              'zones': ['ROOT']},
+        '10': {'threads': 1,
+               'zones': ['example']},
+    }
     _lua_dns_script_file = """
 
     function prerpz(dq)
@@ -242,22 +248,6 @@ api-key=%s
 log-rpz-changes=yes
 """ % (_confdir, _wsPort, _wsPassword, _apiKey)
 
-    @classmethod
-    def setUpClass(cls):
-
-        cls.setUpSockets()
-        cls.startResponders()
-
-        confdir = os.path.join('configs', cls._confdir)
-        cls.createConfigDir(confdir)
-
-        cls.generateRecursorConfig(confdir)
-        cls.startRecursor(confdir, cls._recursorPort)
-
-    @classmethod
-    def tearDownClass(cls):
-        cls.tearDownRecursor()
-
     def checkBlocked(self, name, shouldBeBlocked=True, adQuery=False, singleCheck=False):
         query = dns.message.make_query(name, 'A', want_dnssec=True)
         query.flags |= dns.flags.CD
@@ -938,27 +928,6 @@ class RPZCNameChainCustomTest(RPZRecursorTest):
     """ % (_confdir)
     _config_template = ""
 
-    @classmethod
-    def setUpClass(cls):
-
-        cls.setUpSockets()
-        cls.startResponders()
-
-        confdir = os.path.join('configs', cls._confdir)
-        cls.createConfigDir(confdir)
-
-        cls.generateAllAuthConfig(confdir)
-        cls.startAuth(os.path.join(confdir, "auth-8"), cls._PREFIX + '.8')
-        cls.startAuth(os.path.join(confdir, "auth-10"), cls._PREFIX + '.10')
-
-        cls.generateRecursorConfig(confdir)
-        cls.startRecursor(confdir, cls._recursorPort)
-
-    @classmethod
-    def tearDownClass(cls):
-        cls.tearDownAuth()
-        cls.tearDownRecursor()
-
     @classmethod
     def generateRecursorConfig(cls, confdir):
         rpzFilePath = os.path.join(confdir, 'zone.rpz')