Use assertLessEqual

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

diff --git a/regression-tests.auth-py/test_Carbon.py b/regression-tests.auth-py/test_Carbon.py
index 0c53292f4fa18c5645e0826efa5c8c0b8272bb09..69f4bf140bc7afcc0d81f4c60fb489c91a7360b2 100644 (file)
--- a/regression-tests.auth-py/test_Carbon.py
+++ b/regression-tests.auth-py/test_Carbon.py
@@ -94,7 +94,7 @@ class TestCarbon(AuthTest):
             self.assertEqual(len(parts), 3)
             self.assertTrue(parts[1].isdigit())
             self.assertTrue(parts[2].isdigit())
-            self.assertTrue(int(parts[2]) <= int(after))
+            self.assertLessEqual(int(parts[2]), int(after))
 
         self.assertTrue(data2)
         self.assertGreater(len(data2.splitlines()), 1)
@@ -105,7 +105,7 @@ class TestCarbon(AuthTest):
             self.assertEqual(len(parts), 3)
             self.assertTrue(parts[1].isdigit())
             self.assertTrue(parts[2].isdigit())
-            self.assertTrue(int(parts[2]) <= int(after))
+            self.assertLessEqual(int(parts[2]), int(after))
 
         # make sure every carbon server has received at least one connection
         for key in self._carbonCounters:

diff --git a/regression-tests.dnsdist/test_Caching.py b/regression-tests.dnsdist/test_Caching.py
index 7ca4fbb318b01dd5f489c2eb0930ce4db9fb3a95..51767c59b8483c69778906c4cceddc04162a1b80 100644 (file)
--- a/regression-tests.dnsdist/test_Caching.py
+++ b/regression-tests.dnsdist/test_Caching.py
@@ -476,7 +476,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.assertLessEqual(an.ttl, ttl)
 
         # now we wait a bit for the TTL to decrease
         time.sleep(1)
@@ -1942,7 +1942,7 @@ class TestCachingLongTTL(DNSDistTest):
         (_, receivedResponse) = self.sendUDPQuery(query, response=None, useQueue=False)
         self.assertEqual(receivedResponse, response)
         for an in receivedResponse.answer:
-            self.assertTrue(an.ttl <= ttl)
+            self.assertLessEqual(an.ttl, ttl)
 
         time.sleep(self._maxCacheTTL + 1)
 

diff --git a/regression-tests.dnsdist/test_Carbon.py b/regression-tests.dnsdist/test_Carbon.py
index c4a3b9bbe4cd0450c0941918e75974eda89453e6..cb516cf933989f30ed796284cb1dc1b13b58ed63 100644 (file)
--- a/regression-tests.dnsdist/test_Carbon.py
+++ b/regression-tests.dnsdist/test_Carbon.py
@@ -102,7 +102,7 @@ class TestCarbon(DNSDistTest):
             self.assertEqual(len(parts), 3)
             self.assertTrue(self.isfloat(parts[1]))
             self.assertTrue(parts[2].isdigit())
-            self.assertTrue(int(parts[2]) <= int(after))
+            self.assertLessEqual(int(parts[2]), int(after))
 
         self.assertTrue(data2)
         self.assertGreater(len(data2.splitlines()), 1)
@@ -113,7 +113,7 @@ class TestCarbon(DNSDistTest):
             self.assertEqual(len(parts), 3)
             self.assertTrue(self.isfloat(parts[1]))
             self.assertTrue(parts[2].isdigit())
-            self.assertTrue(int(parts[2]) <= int(after))
+            self.assertLessEqual(int(parts[2]), int(after))
 
         # make sure every carbon server has received at least one connection
         for key in self._carbonCounters:
@@ -150,13 +150,13 @@ class TestCarbon(DNSDistTest):
                     self.assertTrue(parts[1].isdigit())
                     self.assertEqual(int(parts[1]), 2)
                     self.assertTrue(parts[2].isdigit())
-                    self.assertTrue(int(parts[2]) <= int(after))
+                    self.assertLessEqual(int(parts[2]), int(after))
                 else:
                     self.assertEqual(len(parts), 3)
                     self.assertTrue(parts[1].isdigit())
                     self.assertEqual(int(parts[1]), 3)
                     self.assertTrue(parts[2].isdigit())
-                    self.assertTrue(int(parts[2]) <= int(after))
+                    self.assertLessEqual(int(parts[2]), int(after))
 
         # check the second carbon server got both servers and
         # servers-up metrics and that they are the same as
@@ -173,10 +173,10 @@ class TestCarbon(DNSDistTest):
                     self.assertTrue(parts[1].isdigit())
                     self.assertEqual(int(parts[1]), 2)
                     self.assertTrue(parts[2].isdigit())
-                    self.assertTrue(int(parts[2]) <= int(after))
+                    self.assertLessEqual(int(parts[2]), int(after))
                 else:
                     self.assertEqual(len(parts), 3)
                     self.assertTrue(parts[1].isdigit())
                     self.assertEqual(int(parts[1]), 3)
                     self.assertTrue(parts[2].isdigit())
-                    self.assertTrue(int(parts[2]) <= int(after))
+                    self.assertLessEqual(int(parts[2]), int(after))

diff --git a/regression-tests.recursor-dnssec/test_Carbon.py b/regression-tests.recursor-dnssec/test_Carbon.py
index 61170edb6593e60864dfb27810a2633c1aa75065..37cd192d08b1b1bcb1ea9451e6d9fe4dac9fd436 100644 (file)
--- a/regression-tests.recursor-dnssec/test_Carbon.py
+++ b/regression-tests.recursor-dnssec/test_Carbon.py
@@ -94,7 +94,7 @@ class CarbonTest(RecursorTest):
             self.assertEqual(len(parts), 3)
             self.assertTrue(parts[1].isdigit())
             self.assertTrue(parts[2].isdigit())
-            self.assertTrue(int(parts[2]) <= int(after))
+            self.assertLessEqual(int(parts[2]), int(after))
 
         self.assertTrue(data2)
         self.assertGreater(len(data2.splitlines()), 1)
@@ -105,7 +105,7 @@ class CarbonTest(RecursorTest):
             self.assertEqual(len(parts), 3)
             self.assertTrue(parts[1].isdigit())
             self.assertTrue(parts[2].isdigit())
-            self.assertTrue(int(parts[2]) <= int(after))
+            self.assertLessEqual(int(parts[2]), int(after))
 
         # make sure every carbon server has received at least one connection
         for key in self._carbonCounters: