Use assertGreater

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

diff --git a/regression-tests.auth-py/authtests.py b/regression-tests.auth-py/authtests.py
index b09273b46d79519246868831a847938d88997fbb..1ad1abb2b999a2393d1483d76f7357a6fb5eef5e 100644 (file)
--- a/regression-tests.auth-py/authtests.py
+++ b/regression-tests.auth-py/authtests.py
@@ -654,7 +654,7 @@ options {
         self.assertEqual(len(msg.answer), 0, "Data found in the the answer section for %s:\n%s" % (msg.question[0].to_text(), '\n'.join([i.to_text() for i in msg.answer])))
 
     def assertAnswerNotEmpty(self, msg):
-        self.assertTrue(len(msg.answer) > 0, "Answer is empty")
+        self.assertGreater(len(msg.answer), 0, "Answer is empty")
 
     def assertRcodeEqual(self, msg, rcode):
         if not isinstance(msg, dns.message.Message):

diff --git a/regression-tests.auth-py/test_Carbon.py b/regression-tests.auth-py/test_Carbon.py
index 18d6e23f7cc2455a65b27986dae8383c6a2efd6f..7abba1428999c73f6072e69fed9f292b2e893259 100644 (file)
--- a/regression-tests.auth-py/test_Carbon.py
+++ b/regression-tests.auth-py/test_Carbon.py
@@ -86,7 +86,7 @@ class TestCarbon(AuthTest):
         after = time.time()
 
         self.assertTrue(data1)
-        self.assertTrue(len(data1.splitlines()) > 1)
+        self.assertGreater(len(data1.splitlines()), 1)
         expectedStart = b"%s.%s.%s." % (self._carbonNamespace.encode('UTF8'), self._carbonServerName.encode('UTF-8'), self._carbonInstance.encode('UTF8'))
         for line in data1.splitlines():
             self.assertTrue(line.startswith(expectedStart))
@@ -97,7 +97,7 @@ class TestCarbon(AuthTest):
             self.assertTrue(int(parts[2]) <= int(after))
 
         self.assertTrue(data2)
-        self.assertTrue(len(data2.splitlines()) > 1)
+        self.assertGreater(len(data2.splitlines()), 1)
         expectedStart = b"%s.%s.%s." % (self._carbonNamespace.encode('UTF8'), self._carbonServerName.encode('UTF-8'), self._carbonInstance.encode('UTF8'))
         for line in data2.splitlines():
             self.assertTrue(line.startswith(expectedStart))

diff --git a/regression-tests.dnsdist/test_Carbon.py b/regression-tests.dnsdist/test_Carbon.py
index 0403e93fa30a061c577517b4fd6225cac5c82dda..846b0e8c089530dd55b3b04a02e1240eb8596335 100644 (file)
--- a/regression-tests.dnsdist/test_Carbon.py
+++ b/regression-tests.dnsdist/test_Carbon.py
@@ -94,7 +94,7 @@ class TestCarbon(DNSDistTest):
         after = time.time()
 
         self.assertTrue(data1)
-        self.assertTrue(len(data1.splitlines()) > 1)
+        self.assertGreater(len(data1.splitlines()), 1)
         expectedStart = b"dnsdist.%s.main." % self._carbonServer1Name.encode('UTF-8')
         for line in data1.splitlines():
             self.assertTrue(line.startswith(expectedStart))
@@ -105,7 +105,7 @@ class TestCarbon(DNSDistTest):
             self.assertTrue(int(parts[2]) <= int(after))
 
         self.assertTrue(data2)
-        self.assertTrue(len(data2.splitlines()) > 1)
+        self.assertGreater(len(data2.splitlines()), 1)
         expectedStart = b"dnsdist.%s.main." % self._carbonServer2Name.encode('UTF-8')
         for line in data2.splitlines():
             self.assertTrue(line.startswith(expectedStart))
@@ -140,7 +140,7 @@ class TestCarbon(DNSDistTest):
         # servers-up metrics and that they are the same as
         # configured in the class definition
         self.assertTrue(data1)
-        self.assertTrue(len(data1.splitlines()) > 1)
+        self.assertGreater(len(data1.splitlines()), 1)
         expectedStart = b"dnsdist.%s.main.pools._default_.servers" % self._carbonServer1Name.encode('UTF-8')
         for line in data1.splitlines():
             if expectedStart in line:
@@ -163,7 +163,7 @@ class TestCarbon(DNSDistTest):
         # configured in the class definition and the same as
         # the first carbon server
         self.assertTrue(data2)
-        self.assertTrue(len(data2.splitlines()) > 1)
+        self.assertGreater(len(data2.splitlines()), 1)
         expectedStart = b"dnsdist.%s.main.pools._default_.servers" % self._carbonServer2Name.encode('UTF-8')
         for line in data2.splitlines():
             if expectedStart in line:

diff --git a/regression-tests.dnsdist/test_Lua.py b/regression-tests.dnsdist/test_Lua.py
index df3c78d7b9d00f7c12feecc62a4a3b2fb4ab6c9b..20237f616083cccc74e9fb1958b576acdc49d302 100644 (file)
--- a/regression-tests.dnsdist/test_Lua.py
+++ b/regression-tests.dnsdist/test_Lua.py
@@ -40,7 +40,7 @@ class TestLuaThread(DNSDistTest):
         count1 = self.sendConsoleCommand('counter')
         time.sleep(3)
         count2 = self.sendConsoleCommand('counter')
-        self.assertTrue(count2 > count1)
+        self.assertGreater(count2, count1)
 
 class TestLuaDNSHeaderBindings(DNSDistTest):
     _config_template = """

diff --git a/regression-tests.dnsdist/test_OutgoingDOH.py b/regression-tests.dnsdist/test_OutgoingDOH.py
index 6fdb6813c4fa8f614e5e8b64a581d72618b5962a..ef8abd40049acebe86339dca1478ce46880a6b38 100644 (file)
--- a/regression-tests.dnsdist/test_OutgoingDOH.py
+++ b/regression-tests.dnsdist/test_OutgoingDOH.py
@@ -288,7 +288,7 @@ class TestOutgoingDOHOpenSSL(DNSDistTest, OutgoingDOHTests):
 
     def testZNonEmptyKeyfile(self):
         self.assertTrue(os.path.exists("/tmp/dohkeys"))
-        self.assertTrue(os.path.getsize("/tmp/dohkeys") > 0)
+        self.assertGreater(os.path.getsize("/tmp/dohkeys"), 0)
 
     @staticmethod
     def sniCallback(sslSocket, sni, sslContext):

diff --git a/regression-tests.dnsdist/test_OutgoingTLS.py b/regression-tests.dnsdist/test_OutgoingTLS.py
index 71d0edb891ae198edbdb87b0204aa1f06eee4cdb..0ae750fca1bff8d89696b45c14a4c0b0184b5e67 100644 (file)
--- a/regression-tests.dnsdist/test_OutgoingTLS.py
+++ b/regression-tests.dnsdist/test_OutgoingTLS.py
@@ -150,7 +150,7 @@ class TestOutgoingTLSOpenSSL(DNSDistTest, OutgoingTLSTests):
 
     def testZNonEmptyKeyfile(self):
         self.assertTrue(os.path.exists("/tmp/dotkeys"))
-        self.assertTrue(os.path.getsize("/tmp/dotkeys") > 0)
+        self.assertGreater(os.path.getsize("/tmp/dotkeys"), 0)
 
     @staticmethod
     def sniCallback(sslSocket, sni, sslContext):

diff --git a/regression-tests.dnsdist/test_Responses.py b/regression-tests.dnsdist/test_Responses.py
index d00d5d1be259fef78d9bc4085be5695a2c5cb897..1773d9dce2949addf4e7705f698918c2c0ac2879 100644 (file)
--- a/regression-tests.dnsdist/test_Responses.py
+++ b/regression-tests.dnsdist/test_Responses.py
@@ -32,7 +32,7 @@ class TestResponseRuleNXDelayed(DNSDistTest):
         receivedQuery.id = query.id
         self.assertEqual(query, receivedQuery)
         self.assertEqual(response, receivedResponse)
-        self.assertTrue((end - begin) > timedelta(0, 1))
+        self.assertGreater(end - begin, timedelta(0, 1))
 
         # NoError over UDP
         response.set_rcode(dns.rcode.NOERROR)
@@ -84,7 +84,7 @@ class TestResponseRuleERCode(DNSDistTest):
         receivedQuery.id = query.id
         self.assertEqual(query, receivedQuery)
         self.assertEqual(response, receivedResponse)
-        self.assertTrue((end - begin) > timedelta(0, 1))
+        self.assertGreater(end - begin, timedelta(0, 1))
 
         # BADKEY (17, an ERCode) over UDP
         response.set_rcode(17)
@@ -414,7 +414,7 @@ class TestResponseLuaActionReturnSyntax(DNSDistTest):
         receivedQuery.id = query.id
         self.assertEqual(query, receivedQuery)
         self.assertEqual(response, receivedResponse)
-        self.assertTrue((end - begin) > timedelta(0, 1))
+        self.assertGreater(end - begin, timedelta(0, 1))
 
     def testDropped(self):
         """

diff --git a/regression-tests.dnsdist/test_RulesActions.py b/regression-tests.dnsdist/test_RulesActions.py
index 4c9a6805f05c525d4785e5e1a9e6495cdfee23f2..1359a0e7e342eecec2d970a5ab88e837e8b367c7 100644 (file)
--- a/regression-tests.dnsdist/test_RulesActions.py
+++ b/regression-tests.dnsdist/test_RulesActions.py
@@ -280,7 +280,7 @@ class TestAdvancedDelay(DNSDistTest):
         receivedQuery.id = query.id
         self.assertEqual(query, receivedQuery)
         self.assertEqual(response, receivedResponse)
-        self.assertTrue((end - begin) > timedelta(0, 1))
+        self.assertGreater(end - begin, timedelta(0, 1))
 
         begin = datetime.now()
         (receivedQuery, receivedResponse) = self.sendTCPQuery(query, response)
@@ -451,7 +451,7 @@ class TestAdvancedLogAction(DNSDistTest):
             self.assertEqual(response, receivedResponse)
 
         self.assertTrue(os.path.isfile('dnsdist.log'))
-        self.assertTrue(os.stat('dnsdist.log').st_size > 0)
+        self.assertGreater(os.stat('dnsdist.log').st_size, 0)
 
 class TestAdvancedDNSSEC(DNSDistTest):
 

diff --git a/regression-tests.recursor-dnssec/test_Carbon.py b/regression-tests.recursor-dnssec/test_Carbon.py
index 37bb3d4726e266acb78f23f615dee4a8afcec93a..cc770d7f252f30654f03cc8928c9fbc3f013568c 100644 (file)
--- a/regression-tests.recursor-dnssec/test_Carbon.py
+++ b/regression-tests.recursor-dnssec/test_Carbon.py
@@ -86,7 +86,7 @@ class CarbonTest(RecursorTest):
         after = time.time()
 
         self.assertTrue(data1)
-        self.assertTrue(len(data1.splitlines()) > 1)
+        self.assertGreater(len(data1.splitlines()), 1)
         expectedStart = b"%s.%s.%s." % (self._carbonNamespace.encode('UTF8'), self._carbonServerName.encode('UTF-8'), self._carbonInstance.encode('UTF8'))
         for line in data1.splitlines():
             self.assertTrue(line.startswith(expectedStart))
@@ -97,7 +97,7 @@ class CarbonTest(RecursorTest):
             self.assertTrue(int(parts[2]) <= int(after))
 
         self.assertTrue(data2)
-        self.assertTrue(len(data2.splitlines()) > 1)
+        self.assertGreater(len(data2.splitlines()), 1)
         expectedStart = b"%s.%s.%s." % (self._carbonNamespace.encode('UTF8'), self._carbonServerName.encode('UTF-8'), self._carbonInstance.encode('UTF8'))
         for line in data2.splitlines():
             self.assertTrue(line.startswith(expectedStart))