Merge pull request #8668 from cmouse/apex-dname

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

diff --git a/regression-tests.dnsdist/test_HealthChecks.py b/regression-tests.dnsdist/test_HealthChecks.py
index 7acbbf552c8045e7cd21e8548f6c4808f9ecbbe7..7db83ccd9c8abf6efe61b7cbc7af3fd32f303087 100644 (file)
--- a/regression-tests.dnsdist/test_HealthChecks.py
+++ b/regression-tests.dnsdist/test_HealthChecks.py
@@ -27,7 +27,7 @@ class TestDefaultHealthCheck(HealthCheckTest):
         HealthChecks: Default
         """
         before = TestDefaultHealthCheck._healthCheckCounter
-        time.sleep(1)
+        time.sleep(1.5)
         self.assertGreater(TestDefaultHealthCheck._healthCheckCounter, before)
         self.assertEquals(self.getBackendStatus(), 'up')
 
@@ -35,14 +35,14 @@ class TestDefaultHealthCheck(HealthCheckTest):
         self.assertEquals(self.getBackendStatus(), 'up')
 
         before = TestDefaultHealthCheck._healthCheckCounter
-        time.sleep(1)
+        time.sleep(1.5)
         self.assertEquals(TestDefaultHealthCheck._healthCheckCounter, before)
 
         self.sendConsoleCommand("getServer(0):setDown()")
         self.assertEquals(self.getBackendStatus(), 'down')
 
         before = TestDefaultHealthCheck._healthCheckCounter
-        time.sleep(1)
+        time.sleep(1.5)
         self.assertEquals(TestDefaultHealthCheck._healthCheckCounter, before)
 
         self.sendConsoleCommand("getServer(0):setAuto()")
@@ -50,18 +50,16 @@ class TestDefaultHealthCheck(HealthCheckTest):
         self.assertEquals(self.getBackendStatus(), 'up')
 
         before = TestDefaultHealthCheck._healthCheckCounter
-        time.sleep(1)
+        time.sleep(1.5)
         self.assertGreater(TestDefaultHealthCheck._healthCheckCounter, before)
         self.assertEquals(self.getBackendStatus(), 'up')
 
         self.sendConsoleCommand("getServer(0):setDown()")
         self.assertEquals(self.getBackendStatus(), 'down')
         self.sendConsoleCommand("getServer(0):setAuto(false)")
-        # we specified that the new state should be up until the next health check
-        self.assertEquals(self.getBackendStatus(), 'down')
 
         before = TestDefaultHealthCheck._healthCheckCounter
-        time.sleep(1)
+        time.sleep(1.5)
         self.assertGreater(TestDefaultHealthCheck._healthCheckCounter, before)
         self.assertEquals(self.getBackendStatus(), 'up')
 
@@ -82,7 +80,7 @@ class TestHealthCheckForcedUP(HealthCheckTest):
         HealthChecks: Forced UP
         """
         before = TestHealthCheckForcedUP._healthCheckCounter
-        time.sleep(1)
+        time.sleep(1.5)
         self.assertEquals(TestHealthCheckForcedUP._healthCheckCounter, before)
         self.assertEquals(self.getBackendStatus(), 'up')
 
@@ -103,7 +101,7 @@ class TestHealthCheckForcedDown(HealthCheckTest):
         HealthChecks: Forced Down
         """
         before = TestHealthCheckForcedDown._healthCheckCounter
-        time.sleep(1)
+        time.sleep(1.5)
         self.assertEquals(TestHealthCheckForcedDown._healthCheckCounter, before)
 
 class TestHealthCheckCustomName(HealthCheckTest):
@@ -124,7 +122,7 @@ class TestHealthCheckCustomName(HealthCheckTest):
         HealthChecks: Custom name
         """
         before = TestHealthCheckCustomName._healthCheckCounter
-        time.sleep(1)
+        time.sleep(1.5)
         self.assertGreater(TestHealthCheckCustomName._healthCheckCounter, before)
         self.assertEquals(self.getBackendStatus(), 'up')
 
@@ -133,7 +131,7 @@ class TestHealthCheckCustomNameNoAnswer(HealthCheckTest):
     # because it uses a different health check configuration
     _testServerPort = 5384
 
-    _healthCheckAnswerUnexpected = False
+    _answerUnexpected = False
     _config_template = """
     setKey("%s")
     controlSocket("127.0.0.1:%d")
@@ -145,7 +143,7 @@ class TestHealthCheckCustomNameNoAnswer(HealthCheckTest):
         HealthChecks: Custom name not expected by the responder
         """
         before = TestHealthCheckCustomNameNoAnswer._healthCheckCounter
-        time.sleep(1)
+        time.sleep(1.5)
         self.assertEquals(TestHealthCheckCustomNameNoAnswer._healthCheckCounter, before)
         self.assertEquals(self.getBackendStatus(), 'down')
 
@@ -153,7 +151,7 @@ class TestHealthCheckCustomFunction(HealthCheckTest):
     # this test suite uses a different responder port
     # because it uses a different health check configuration
     _testServerPort = 5385
-    _healthCheckAnswerUnexpected = False
+    _answerUnexpected = False
 
     _healthCheckName = 'powerdns.com.'
     _config_template = """
@@ -163,7 +161,7 @@ class TestHealthCheckCustomFunction(HealthCheckTest):
     function myHealthCheckFunction(qname, qtype, qclass, dh)
       dh:setCD(true)
 
-      return newDNSName('powerdns.com.'), dnsdist.AAAA, qclass
+      return newDNSName('powerdns.com.'), DNSQType.AAAA, qclass
     end
 
     srv = newServer{address="127.0.0.1:%d", checkName='powerdns.org.', checkFunction=myHealthCheckFunction}
@@ -174,6 +172,6 @@ class TestHealthCheckCustomFunction(HealthCheckTest):
         HealthChecks: Custom function
         """
         before = TestHealthCheckCustomFunction._healthCheckCounter
-        time.sleep(1)
+        time.sleep(1.5)
         self.assertGreater(TestHealthCheckCustomFunction._healthCheckCounter, before)
         self.assertEquals(self.getBackendStatus(), 'up')