From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 10 Feb 2022 10:40:31 +0000 (+0100)
Subject: dnsdist: Do a second backend upgrade check if the first failed, in the regression... 
X-Git-Tag: rec-4.7.0-alpha1~9^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e060bf77edb97cb97e55b910618098d2870b009a;p=thirdparty%2Fpdns.git

dnsdist: Do a second backend upgrade check if the first failed, in the regression tests
---

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())