From 63291e0c583fc9620c49708252340238b3fbba3b Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Wed, 30 Aug 2023 15:55:01 +0200 Subject: [PATCH] dnsdist: Reduce the UDP wait time for blocked queries in the tests We know that we are not going to get a response, and waiting for too long increases the risk that the dynamic block is no longer present and/or has expired (validity of 0s) in the subsequent API check. --- regression-tests.dnsdist/dnsdistDynBlockTests.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/regression-tests.dnsdist/dnsdistDynBlockTests.py b/regression-tests.dnsdist/dnsdistDynBlockTests.py index ccee6eb7c3..67f986b585 100644 --- a/regression-tests.dnsdist/dnsdistDynBlockTests.py +++ b/regression-tests.dnsdist/dnsdistDynBlockTests.py @@ -77,7 +77,7 @@ class DynBlocksTest(DNSDistTest): waitForMaintenanceToRun() # we should now be dropped for up to self._dynBlockDuration + self._dynBlockPeriod - (_, receivedResponse) = self.sendUDPQuery(query, response=None, useQueue=False) + (_, receivedResponse) = self.sendUDPQuery(query, response=None, useQueue=False, timeout=1) self.assertEqual(receivedResponse, None) if testViaAPI: @@ -269,7 +269,7 @@ class DynBlocksTest(DNSDistTest): print(time.time()) # we should now be dropped for up to self._dynBlockDuration + self._dynBlockPeriod - (_, receivedResponse) = self.sendUDPQuery(query, response=None, useQueue=False) + (_, receivedResponse) = self.sendUDPQuery(query, response=None, useQueue=False, timeout=1) self.assertEqual(receivedResponse, None) print(self.sendConsoleCommand("showDynBlocks()")) @@ -378,7 +378,7 @@ class DynBlocksTest(DNSDistTest): waitForMaintenanceToRun() # we should now be dropped for up to self._dynBlockDuration + self._dynBlockPeriod - (_, receivedResponse) = self.sendUDPQuery(query, response=None, useQueue=False) + (_, receivedResponse) = self.sendUDPQuery(query, response=None, useQueue=False, timeout=1) self.assertEqual(receivedResponse, None) # wait until we are not blocked anymore @@ -487,7 +487,7 @@ class DynBlocksTest(DNSDistTest): waitForMaintenanceToRun() # we should now be dropped for up to self._dynBlockDuration + self._dynBlockPeriod - (_, receivedResponse) = self.sendUDPQuery(query, response=None, useQueue=False) + (_, receivedResponse) = self.sendUDPQuery(query, response=None, useQueue=False, timeout=1) self.assertEqual(receivedResponse, None) # wait until we are not blocked anymore -- 2.47.2