Merge pull request #13670 from chbruyand/dnsdist-doq-acl

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

diff --git a/regression-tests.dnsdist/test_CDB.py b/regression-tests.dnsdist/test_CDB.py
index c9b4dbe90ee3f5170624637e7af782589797f32a..2b4f0a06ad98416272af2bcc58d89da41b074571 100644 (file)
--- a/regression-tests.dnsdist/test_CDB.py
+++ b/regression-tests.dnsdist/test_CDB.py
@@ -1,12 +1,22 @@
 #!/usr/bin/env python
+import cdbx
 import unittest
 import dns
 import os
-import shutil
 import socket
 import time
 from dnsdisttests import DNSDistTest
 
+def writeCDB(fname, variant=1):
+    cdb = cdbx.CDB.make(fname+'.tmp')
+    cdb.add(socket.inet_aton(f'127.0.0.{variant}'), b'this is the value of the source address tag')
+    cdb.add(b'\x05qname\x03cdb\x05tests\x08powerdns\x03com\x00', b'this is the value of the qname tag')
+    cdb.add(b'\x06suffix\x03cdb\x05tests\x08powerdns\x03com\x00', b'this is the value of the suffix tag')
+    cdb.add(b'this is the value of the qname tag', b'this is the value of the second tag')
+    cdb.commit().close()
+    os.rename(fname+'.tmp', fname)
+    cdb.close()
+
 @unittest.skipIf('SKIP_CDB_TESTS' in os.environ, 'CDB tests are disabled')
 class CDBTest(DNSDistTest):
 
@@ -53,7 +63,7 @@ class TestCDBSimple(CDBTest):
 
     @classmethod
     def setUpCDB(cls):
-        shutil.copyfile('kvs.cdb.1', cls._cdbFileName)
+        writeCDB(cls._cdbFileName, 1)
 
     @classmethod
     def setUpClass(cls):
@@ -86,7 +96,7 @@ class TestCDBSimple(CDBTest):
             (receivedQuery, receivedResponse) = sender(query, response=None, useQueue=False)
             self.assertFalse(receivedQuery)
             self.assertTrue(receivedResponse)
-            self.assertEquals(expectedResponse, receivedResponse)
+            self.assertEqual(expectedResponse, receivedResponse)
 
     def testCDBQNamePlusTagLookup(self):
         """
@@ -109,7 +119,7 @@ class TestCDBSimple(CDBTest):
             (receivedQuery, receivedResponse) = sender(query, response=None, useQueue=False)
             self.assertFalse(receivedQuery)
             self.assertTrue(receivedResponse)
-            self.assertEquals(expectedResponse, receivedResponse)
+            self.assertEqual(expectedResponse, receivedResponse)
 
     def testCDBSuffixLookup(self):
         """
@@ -132,13 +142,13 @@ class TestCDBSimple(CDBTest):
             (receivedQuery, receivedResponse) = sender(query, response=None, useQueue=False)
             self.assertFalse(receivedQuery)
             self.assertTrue(receivedResponse)
-            self.assertEquals(expectedResponse, receivedResponse)
+            self.assertEqual(expectedResponse, receivedResponse)
 
 class TestCDBReload(CDBTest):
 
     @classmethod
     def setUpCDB(cls):
-        shutil.copyfile('kvs.cdb.1', cls._cdbFileName)
+        writeCDB(cls._cdbFileName, 1)
 
     @classmethod
     def setUpClass(cls):
@@ -172,10 +182,13 @@ class TestCDBReload(CDBTest):
             (receivedQuery, receivedResponse) = sender(query, response=None, useQueue=False)
             self.assertFalse(receivedQuery)
             self.assertTrue(receivedResponse)
-            self.assertEquals(expectedResponse, receivedResponse)
+            self.assertEqual(expectedResponse, receivedResponse)
 
-        # switch to the second DB which has no entry for 127.0.0.1
-        shutil.copyfile('kvs.cdb.2', self._cdbFileName)
+        # write a new CDB which has no entry for 127.0.0.1
+        # first ensure that the mtime will change after writing
+        # the new version
+        time.sleep(1)
+        writeCDB(self._cdbFileName, 2)
         # wait long enough for the CDB database to be reloaded
         time.sleep(self._cdbRefreshDelay + 1)
 
@@ -193,4 +206,4 @@ class TestCDBReload(CDBTest):
             (receivedQuery, receivedResponse) = sender(query, response=None, useQueue=False)
             self.assertFalse(receivedQuery)
             self.assertTrue(receivedResponse)
-            self.assertEquals(expectedResponse, receivedResponse)
+            self.assertEqual(expectedResponse, receivedResponse)