From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Wed, 12 Nov 2025 19:09:14 +0000 (-0500) Subject: Use assertGreaterEqual X-Git-Tag: rec-5.4.0-alpha1~95^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf0b402647fc294a7534beac4b936aa1cb7ff096;p=thirdparty%2Fpdns.git Use assertGreaterEqual https://docs.python.org/3/library/unittest.html#unittest.TestCase.assertGreaterEqual 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 7abba14289..0c53292f4f 100644 --- a/regression-tests.auth-py/test_Carbon.py +++ b/regression-tests.auth-py/test_Carbon.py @@ -110,5 +110,5 @@ class TestCarbon(AuthTest): # make sure every carbon server has received at least one connection for key in self._carbonCounters: value = self._carbonCounters[key] - self.assertTrue(value >= 1) + self.assertGreaterEqual(value, 1) diff --git a/regression-tests.dnsdist/test_API.py b/regression-tests.dnsdist/test_API.py index b1eadcd07b..72529696bb 100644 --- a/regression-tests.dnsdist/test_API.py +++ b/regression-tests.dnsdist/test_API.py @@ -139,7 +139,7 @@ class TestAPIBasics(APITestsBase): for key in ['id', 'creationOrder', 'matches', 'rule', 'action', 'uuid']: self.assertIn(key, rule) for key in ['id', 'creationOrder', 'matches']: - self.assertTrue(rule[key] >= 0) + self.assertGreaterEqual(rule[key], 0) for server in content['servers']: for key in ['id', 'latency', 'name', 'weight', 'outstanding', 'qpsLimit', @@ -152,7 +152,7 @@ class TestAPIBasics(APITestsBase): for key in ['id', 'latency', 'weight', 'outstanding', 'qpsLimit', 'reuseds', 'qps', 'queries', 'order', 'tcpLatency', 'responses', 'nonCompliantResponses']: - self.assertTrue(server[key] >= 0) + self.assertGreaterEqual(server[key], 0) self.assertTrue(server['state'] in ['up', 'down', 'UP', 'DOWN']) @@ -161,19 +161,19 @@ class TestAPIBasics(APITestsBase): self.assertIn(key, frontend) for key in ['id', 'queries', 'nonCompliantQueries']: - self.assertTrue(frontend[key] >= 0) + self.assertGreaterEqual(frontend[key], 0) for pool in content['pools']: for key in ['id', 'name', 'cacheSize', 'cacheEntries', 'cacheHits', 'cacheMisses', 'cacheDeferredInserts', 'cacheDeferredLookups', 'cacheLookupCollisions', 'cacheInsertCollisions', 'cacheTTLTooShorts', 'cacheCleanupCount']: self.assertIn(key, pool) for key in ['id', 'cacheSize', 'cacheEntries', 'cacheHits', 'cacheMisses', 'cacheDeferredInserts', 'cacheDeferredLookups', 'cacheLookupCollisions', 'cacheInsertCollisions', 'cacheTTLTooShorts', 'cacheCleanupCount']: - self.assertTrue(pool[key] >= 0) + self.assertGreaterEqual(pool[key], 0) stats = content['statistics'] for key in self._expectedMetrics: self.assertIn(key, stats) - self.assertTrue(stats[key] >= 0) + self.assertGreaterEqual(stats[key], 0) for key in stats: self.assertIn(key, self._expectedMetrics) @@ -196,7 +196,7 @@ class TestAPIBasics(APITestsBase): self.assertIn(key, content['stats']) for key in ['cacheSize', 'cacheEntries', 'cacheHits', 'cacheMisses', 'cacheDeferredInserts', 'cacheDeferredLookups', 'cacheLookupCollisions', 'cacheInsertCollisions', 'cacheTTLTooShorts']: - self.assertTrue(content['stats'][key] >= 0) + self.assertGreaterEqual(content['stats'][key], 0) for server in content['servers']: for key in ['id', 'latency', 'name', 'weight', 'outstanding', 'qpsLimit', @@ -209,7 +209,7 @@ class TestAPIBasics(APITestsBase): for key in ['id', 'latency', 'weight', 'outstanding', 'qpsLimit', 'reuseds', 'qps', 'queries', 'order', 'tcpLatency', 'responses', 'nonCompliantResponses']: - self.assertTrue(server[key] >= 0) + self.assertGreaterEqual(server[key], 0) self.assertTrue(server['state'] in ['up', 'down', 'UP', 'DOWN']) @@ -249,7 +249,7 @@ class TestAPIBasics(APITestsBase): for key in ['max-outstanding', 'stale-cache-entries-ttl', 'tcp-recv-timeout', 'tcp-send-timeout']: - self.assertTrue(values[key] >= 0) + self.assertGreaterEqual(values[key], 0) self.assertTrue(values['ecs-source-prefix-v4'] >= 0 and values['ecs-source-prefix-v4'] <= 32) self.assertTrue(values['ecs-source-prefix-v6'] >= 0 and values['ecs-source-prefix-v6'] <= 128) @@ -313,7 +313,7 @@ class TestAPIBasics(APITestsBase): for key in self._expectedMetrics: self.assertIn(key, values) - self.assertTrue(values[key] >= 0) + self.assertGreaterEqual(values[key], 0) for key in values: self.assertIn(key, self._expectedMetrics) @@ -332,7 +332,7 @@ class TestAPIBasics(APITestsBase): for key in self._expectedMetrics: self.assertIn(key, content) - self.assertTrue(content[key] >= 0) + self.assertGreaterEqual(content[key], 0) def testJsonstatDynblocklist(self): """ @@ -351,7 +351,7 @@ class TestAPIBasics(APITestsBase): self.assertIn(key, content) for key in ['blocks']: - self.assertTrue(content[key] >= 0) + self.assertGreaterEqual(content[key], 0) def testServersLocalhostRings(self): """ @@ -902,7 +902,7 @@ class TestAPICustomStatistics(APITestsBase): for key in expected: self.assertIn(key, content) - self.assertTrue(content[key] >= 0) + self.assertGreaterEqual(content[key], 0) unexpected = ['my-labeled-gauge', 'my-labeled-counter'] diff --git a/regression-tests.dnsdist/test_Carbon.py b/regression-tests.dnsdist/test_Carbon.py index 846b0e8c08..c4a3b9bbe4 100644 --- a/regression-tests.dnsdist/test_Carbon.py +++ b/regression-tests.dnsdist/test_Carbon.py @@ -118,7 +118,7 @@ class TestCarbon(DNSDistTest): # make sure every carbon server has received at least one connection for key in self._carbonCounters: value = self._carbonCounters[key] - self.assertTrue(value >= 1) + self.assertGreaterEqual(value, 1) def testCarbonServerUp(self): """ diff --git a/regression-tests.recursor-dnssec/test_Carbon.py b/regression-tests.recursor-dnssec/test_Carbon.py index cc770d7f25..61170edb65 100644 --- a/regression-tests.recursor-dnssec/test_Carbon.py +++ b/regression-tests.recursor-dnssec/test_Carbon.py @@ -110,5 +110,5 @@ class CarbonTest(RecursorTest): # make sure every carbon server has received at least one connection for key in self._carbonCounters: value = self._carbonCounters[key] - self.assertTrue(value >= 1) + self.assertGreaterEqual(value, 1)