Merge pull request #13923 from rgacogne/ddist-xfr-response-chain

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

diff --git a/regression-tests.dnsdist/test_OOOR.py b/regression-tests.dnsdist/test_OOOR.py
index 545bd808082d7e7375250d0295def59d213b37a0..aa9b76af78f36fc0d6116848acae6a04394a5fdb 100644 (file)
--- a/regression-tests.dnsdist/test_OOOR.py
+++ b/regression-tests.dnsdist/test_OOOR.py
@@ -4,7 +4,7 @@ import socket
 import struct
 import time
 import threading
-from dnsdisttests import DNSDistTest
+from dnsdisttests import DNSDistTest, pickAvailablePort
 
 class OOORTCPResponder(object):
 
@@ -62,7 +62,7 @@ class OOORTCPResponder(object):
             thread = threading.Thread(name='Connection Handler',
                                       target=self.handleConnection,
                                       args=[conn])
-            thread.setDaemon(True)
+            thread.daemon = True
             thread.start()
 
         sock.close()
@@ -132,20 +132,20 @@ class ReverseOOORTCPResponder(OOORTCPResponder):
             thread = threading.Thread(name='Connection Handler',
                                       target=self.handleConnection,
                                       args=[conn])
-            thread.setDaemon(True)
+            thread.daemon = True
             thread.start()
 
         sock.close()
 
 
-OOORResponderPort = 5371
+OOORResponderPort = pickAvailablePort()
 ooorTCPResponder = threading.Thread(name='TCP Responder', target=OOORTCPResponder, args=[OOORResponderPort])
-ooorTCPResponder.setDaemon(True)
+ooorTCPResponder.daemon = True
 ooorTCPResponder.start()
 
-ReverseOOORResponderPort = 5372
+ReverseOOORResponderPort = pickAvailablePort()
 ReverseOoorTCPResponder = threading.Thread(name='TCP Responder', target=ReverseOOORTCPResponder, args=[ReverseOOORResponderPort])
-ReverseOoorTCPResponder.setDaemon(True)
+ReverseOoorTCPResponder.daemon = True
 ReverseOoorTCPResponder.start()
 
 class TestOOORWithClientNotBackend(DNSDistTest):
@@ -195,7 +195,7 @@ class TestOOORWithClientNotBackend(DNSDistTest):
             self.assertTrue(receivedResponse)
             receivedResponses[str(receivedResponse.question[0].name)] = (receivedResponse)
 
-        self.assertEquals(len(receivedResponses), 5)
+        self.assertEqual(len(receivedResponses), 5)
         for idx in range(5):
             self.assertIn('%d.simple.ooor.tests.powerdns.com.' % (idx), receivedResponses)
 
@@ -230,7 +230,7 @@ class TestOOORWithClientNotBackend(DNSDistTest):
             self.assertTrue(receivedResponse)
             receivedResponses[str(receivedResponse.question[0].name)] = (receivedResponse)
 
-        self.assertEquals(len(receivedResponses), 100)
+        self.assertEqual(len(receivedResponses), 100)
         for idx in range(5):
             self.assertIn('%d.more-queries.ooor.tests.powerdns.com.' % (idx), receivedResponses)
 
@@ -284,11 +284,11 @@ class TestOOORWithClientAndBackend(DNSDistTest):
             self.assertTrue(receivedResponse)
             receivedResponses[str(receivedResponse.question[0].name)] = (receivedResponse)
 
-        self.assertEquals(len(receivedResponses), 5)
+        self.assertEqual(len(receivedResponses), 5)
         for idx in range(5):
             self.assertIn('%d.simple.reverse-ooor.tests.powerdns.com.' % (idx), receivedResponses)
 
-        self.assertEquals(ReverseOOORTCPResponder.numberOfConnections, 1)
+        self.assertEqual(ReverseOOORTCPResponder.numberOfConnections, 1)
 
     def testMoreQueriesThanAllowedInFlight(self):
         """
@@ -318,10 +318,10 @@ class TestOOORWithClientAndBackend(DNSDistTest):
             receivedResponses[str(receivedResponse.question[0].name)] = (receivedResponse)
             #print("Received a response for %s" % (receivedResponse.question[0].name))
 
-        self.assertEquals(len(receivedResponses), 100)
+        self.assertEqual(len(receivedResponses), 100)
         for idx in range(5):
             self.assertIn('%d.more-queries.reverse-ooor.tests.powerdns.com.' % (idx), receivedResponses)
 
         # in theory they could all be handled by the same backend if we get the responses
         # fast enough, but over 100 queries that's very, very unlikely
-        self.assertEquals(ReverseOOORTCPResponder.numberOfConnections, 2)
+        self.assertEqual(ReverseOOORTCPResponder.numberOfConnections, 2)