From e060bf77edb97cb97e55b910618098d2870b009a Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Thu, 10 Feb 2022 11:40:31 +0100 Subject: [PATCH] dnsdist: Do a second backend upgrade check if the first failed, in the regression tests --- .../test_BackendDiscovery.py | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/regression-tests.dnsdist/test_BackendDiscovery.py b/regression-tests.dnsdist/test_BackendDiscovery.py index 5bfbc79ebc..76a9175505 100644 --- a/regression-tests.dnsdist/test_BackendDiscovery.py +++ b/regression-tests.dnsdist/test_BackendDiscovery.py @@ -163,13 +163,7 @@ class TestBackendDiscovery(DNSDistTest): # and NO corresponding DoT responder # this is not a mistake! - # enough time for discovery to happen - time.sleep(5) - - def testBackendUpgrade(self): - """ - Backend Discovery: Upgrade - """ + def checkBackendsUpgraded(self): output = self.sendConsoleCommand('showServers()') print(output) @@ -197,4 +191,17 @@ class TestBackendDiscovery(DNSDistTest): '127.0.0.1:10653': '', '127.0.0.2:10654': '' } - self.assertEquals(backends, expected) + print(backends) + return backends == expected + + def testBackendUpgrade(self): + """ + Backend Discovery: Upgrade + """ + + # enough time for discovery to happen + time.sleep(5) + if not self.checkBackendsUpgraded(): + # 5s is not enough with TSAN + time.sleep(5) + self.assertTrue(self.checkBackendsUpgraded()) -- 2.47.3