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 dcf2051a99fe7a357c3f1305a2947b32e9f507f2..4fcd3f29ba74c245a9e44f2c88fe341fd90fa08d 100644 (file)
--- 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 010639a0d784a015a6387bd141a7b883266d0e27..9c3642b63e5b82f445e93845881ae93978c7bf1b 100644 (file)
--- 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)