From: Remi Gacogne Date: Wed, 7 May 2025 14:18:25 +0000 (+0200) Subject: dnsdist: Gracefully handle missing v6 in backend discovery test X-Git-Tag: dnsdist-2.0.0-alpha2~22^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ed725fe97522e65a9997cd175fff7485676922d;p=thirdparty%2Fpdns.git dnsdist: Gracefully handle missing v6 in backend discovery test This test has been randomly failing on GH actions lately, and it looks like it is because we sometimes do not get the IPv6 addresses when resolving `dns.quad9.net` via the system resolver. --- diff --git a/regression-tests.dnsdist/test_BackendDiscovery.py b/regression-tests.dnsdist/test_BackendDiscovery.py index 645bc59be8..49dd50d26e 100644 --- a/regression-tests.dnsdist/test_BackendDiscovery.py +++ b/regression-tests.dnsdist/test_BackendDiscovery.py @@ -439,13 +439,19 @@ class TestBackendDiscoveryByHostname(DNSDistTest): self.assertTrue(len(tokens) == 13 or len(tokens) == 14) backends[tokens[1]] = tokens[2] - if len(backends) != 4: + if len(backends) == 4: + for expected in ['9.9.9.9:53', '149.112.112.112:53', '[2620:fe::9]:53', '[2620:fe::fe]:53']: + self.assertIn(expected, backends) + elif len(backends) == 2: + # looks like we are not getting the IPv6 addresses, thanks GitHub! + for expected in ['9.9.9.9:53', '149.112.112.112:53']: + self.assertIn(expected, backends) + else: return False - for expected in ['9.9.9.9:53', '149.112.112.112:53', '[2620:fe::9]:53', '[2620:fe::fe]:53']: - self.assertIn(expected, backends) for backend in backends: - self.assertTrue(backends[backend]) + self.assertEqual(backends[backend], 'up') + return True def testBackendFromHostname(self):