From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Wed, 12 Nov 2025 19:11:40 +0000 (-0500)
Subject: Use assertLessEqual
X-Git-Tag: rec-5.4.0-alpha1~95^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8379f5ad4c727bf78a53bd702ad80199216122f4;p=thirdparty%2Fpdns.git

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 0c53292f4f..69f4bf140b 100644
--- 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 7ca4fbb318..51767c59b8 100644
--- 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 c4a3b9bbe4..cb516cf933 100644
--- 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 61170edb65..37cd192d08 100644
--- 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: