Use assertLess

https://docs.python.org/3/library/unittest.html#unittest.TestCase.assertLess
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

diff --git a/regression-tests.dnsdist/test_Caching.py b/regression-tests.dnsdist/test_Caching.py
index 6e0a70b9b414fa5b0d89dc570ebbb0ba54dc746c..7ca4fbb318b01dd5f489c2eb0930ce4db9fb3a95 100644 (file)
--- a/regression-tests.dnsdist/test_Caching.py
+++ b/regression-tests.dnsdist/test_Caching.py
@@ -485,7 +485,7 @@ class TestCaching(DNSDistTest):
         (_, receivedResponse) = self.sendUDPQuery(query, response=None, useQueue=False)
         self.assertEqual(receivedResponse, response)
         for an in receivedResponse.answer:
-            self.assertTrue(an.ttl < ttl)
+            self.assertLess(an.ttl, ttl)
 
         total = 0
         for key in self._responsesCounter:

diff --git a/regression-tests.dnsdist/test_Responses.py b/regression-tests.dnsdist/test_Responses.py
index 1773d9dce2949addf4e7705f698918c2c0ac2879..598036f37e8c0847a23536854be6f1620e52c504 100644 (file)
--- a/regression-tests.dnsdist/test_Responses.py
+++ b/regression-tests.dnsdist/test_Responses.py
@@ -42,7 +42,7 @@ class TestResponseRuleNXDelayed(DNSDistTest):
         receivedQuery.id = query.id
         self.assertEqual(query, receivedQuery)
         self.assertEqual(response, receivedResponse)
-        self.assertTrue((end - begin) < timedelta(0, 1))
+        self.assertLess(end - begin, timedelta(0, 1))
 
         # NX over TCP
         response.set_rcode(dns.rcode.NXDOMAIN)
@@ -52,7 +52,7 @@ class TestResponseRuleNXDelayed(DNSDistTest):
         receivedQuery.id = query.id
         self.assertEqual(query, receivedQuery)
         self.assertEqual(response, receivedResponse)
-        self.assertTrue((end - begin) < timedelta(0, 1))
+        self.assertLess(end - begin, timedelta(0, 1))
 
 class TestResponseRuleERCode(DNSDistTest):
 
@@ -94,7 +94,7 @@ class TestResponseRuleERCode(DNSDistTest):
         receivedQuery.id = query.id
         self.assertEqual(query, receivedQuery)
         self.assertEqual(response, receivedResponse)
-        self.assertTrue((end - begin) < timedelta(0, 1))
+        self.assertLess(end - begin, timedelta(0, 1))
 
         # NoError (non-ERcode, basic RCode bits match BADVERS) over UDP
         response.set_rcode(dns.rcode.NOERROR)
@@ -104,7 +104,7 @@ class TestResponseRuleERCode(DNSDistTest):
         receivedQuery.id = query.id
         self.assertEqual(query, receivedQuery)
         self.assertEqual(response, receivedResponse)
-        self.assertTrue((end - begin) < timedelta(0, 1))
+        self.assertLess(end - begin, timedelta(0, 1))
 
 class TestResponseRuleQNameDropped(DNSDistTest):
 

diff --git a/regression-tests.dnsdist/test_RulesActions.py b/regression-tests.dnsdist/test_RulesActions.py
index 1359a0e7e342eecec2d970a5ab88e837e8b367c7..1fd48b21b4f732c21280e6bf312bce11d8eb5532 100644 (file)
--- a/regression-tests.dnsdist/test_RulesActions.py
+++ b/regression-tests.dnsdist/test_RulesActions.py
@@ -288,7 +288,7 @@ class TestAdvancedDelay(DNSDistTest):
         receivedQuery.id = query.id
         self.assertEqual(query, receivedQuery)
         self.assertEqual(response, receivedResponse)
-        self.assertTrue((end - begin) < timedelta(0, 1))
+        self.assertLess(end - begin, timedelta(0, 1))
 
 class TestAdvancedAndNot(DNSDistTest):