Merge pull request #14001 from rgacogne/ddist-ffi-policy-no-server

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

diff --git a/regression-tests.dnsdist/test_XPF.py b/regression-tests.dnsdist/test_XPF.py
index 1ee86526273ab536a426592187c576ee0e19f446..934ad50d9475f360eafc5c33dc434f0c334b35be 100644 (file)
--- a/regression-tests.dnsdist/test_XPF.py
+++ b/regression-tests.dnsdist/test_XPF.py
@@ -21,11 +21,11 @@ class XPFTest(DNSDistTest):
         for add in msg.additional:
             if add.rdtype == self._xpfCode:
                 found = True
-                self.assertEquals(add.rdclass, dns.rdataclass.IN)
-                self.assertEquals(add.ttl, 0)
+                self.assertEqual(add.rdclass, dns.rdataclass.IN)
+                self.assertEqual(add.ttl, 0)
                 xpfData = add.to_rdataset()[0].to_text()
                 # skip the ports
-                self.assertEquals(xpfData[:26], expectedValue[:26])
+                self.assertEqual(xpfData[:26], expectedValue[:26])
 
         self.assertTrue(found)
 
@@ -39,9 +39,9 @@ class XPFTest(DNSDistTest):
         expectedQuery = dns.message.make_query(name, 'A', 'IN')
         # 0x04 is IPv4, 0x11 (17) is UDP then 127.0.0.1 as source and destination
         # and finally the ports, zeroed because we have no way to know them beforehand
-        xpfData = "\# 14 04117f0000017f00000100000000"
+        xpfData = "\\# 14 04117f0000017f00000100000000"
         rdata = dns.rdata.from_text(dns.rdataclass.IN, self._xpfCode, xpfData)
-        rrset = dns.rrset.from_rdata(name, 60, rdata)
+        rrset = dns.rrset.from_rdata(".", 0, rdata)
         expectedQuery.additional.append(rrset)
 
         response = dns.message.make_response(expectedQuery)
@@ -52,16 +52,15 @@ class XPFTest(DNSDistTest):
         receivedQuery.id = expectedQuery.id
         receivedResponse.id = response.id
 
-        self.assertEquals(receivedQuery, expectedQuery)
         self.checkMessageHasXPF(receivedQuery, xpfData)
-        self.assertEquals(response, receivedResponse)
+        self.assertEqual(response, receivedResponse)
 
         expectedQuery = dns.message.make_query(name, 'A', 'IN')
         # 0x04 is IPv4, 0x06 (6) is TCP then 127.0.0.1 as source and destination
         # and finally the ports, zeroed because we have no way to know them beforehand
-        xpfData = "\# 14 04067f0000017f00000100000000"
+        xpfData = "\\# 14 04067f0000017f00000100000000"
         rdata = dns.rdata.from_text(dns.rdataclass.IN, self._xpfCode, xpfData)
-        rrset = dns.rrset.from_rdata(name, 60, rdata)
+        rrset = dns.rrset.from_rdata(".", 0, rdata)
         expectedQuery.additional.append(rrset)
 
         response = dns.message.make_response(expectedQuery)
@@ -72,6 +71,5 @@ class XPFTest(DNSDistTest):
         receivedQuery.id = expectedQuery.id
         receivedResponse.id = response.id
 
-        self.assertEquals(receivedQuery, expectedQuery)
         self.checkMessageHasXPF(receivedQuery, xpfData)
-        self.assertEquals(response, receivedResponse)
+        self.assertEqual(response, receivedResponse)