From: Otto Date: Tue, 23 Nov 2021 10:03:44 +0000 (+0100) Subject: Loosen timing checks that I have seen tripping in tsan enabled tests. X-Git-Tag: dnsdist-1.7.0-beta2~9^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=407950927b7bfd4a2162501cb3ba46d12b556c4a;p=thirdparty%2Fpdns.git Loosen timing checks that I have seen tripping in tsan enabled tests. There are likely more. --- diff --git a/regression-tests.recursor-dnssec/test_AggressiveNSECCache.py b/regression-tests.recursor-dnssec/test_AggressiveNSECCache.py index dcf2051a99..4fcd3f29ba 100644 --- a/regression-tests.recursor-dnssec/test_AggressiveNSECCache.py +++ b/regression-tests.recursor-dnssec/test_AggressiveNSECCache.py @@ -7,7 +7,7 @@ import subprocess class AggressiveNSECCacheBase(RecursorTest): __test__ = False _wsPort = 8042 - _wsTimeout = 2 + _wsTimeout = 10 _wsPassword = 'secretpassword' _apiKey = 'secretapikey' _config_template = """ diff --git a/regression-tests.recursor-dnssec/test_ECS.py b/regression-tests.recursor-dnssec/test_ECS.py index 010639a0d7..9c3642b63e 100644 --- a/regression-tests.recursor-dnssec/test_ECS.py +++ b/regression-tests.recursor-dnssec/test_ECS.py @@ -39,7 +39,7 @@ disable-syslog=yes self.assertRRsetInAnswer(res, expected) # this will break if you are not looking for the first RR, sorry! if expectedFirstTTL is not None: - self.assertEqual(res.answer[0].ttl, expectedFirstTTL) + self.assertTrue(res.answer[0].ttl == expectedFirstTTL or res.answer[0].ttl == expectedFirstTTL - 1) else: expectedFirstTTL = res.answer[0].ttl self.assertEqual(res.edns, query.edns)