Use assertEqual

https://docs.python.org/3/library/unittest.html#unittest.TestCase.assertEqual
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 f308d49bd7e1b089a92c2875189d72eff8fc07ed..b09273b46d79519246868831a847938d88997fbb 100644 (file)
--- a/regression-tests.auth-py/authtests.py
+++ b/regression-tests.auth-py/authtests.py
@@ -651,7 +651,7 @@ options {
             raise AssertionError("RRSIG found in answers for:\n%s" % ret)
 
     def assertAnswerEmpty(self, msg):
-        self.assertTrue(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])))
+        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")

diff --git a/regression-tests.dnsdist/test_Caching.py b/regression-tests.dnsdist/test_Caching.py
index 35d3167331c04453302cc128e8fd350f993e95f0..6e0a70b9b414fa5b0d89dc570ebbb0ba54dc746c 100644 (file)
--- a/regression-tests.dnsdist/test_Caching.py
+++ b/regression-tests.dnsdist/test_Caching.py
@@ -2246,7 +2246,7 @@ class TestCachingDontAge(DNSDistTest):
         (_, receivedResponse) = self.sendUDPQuery(query, response=None, useQueue=False)
         self.assertEqual(receivedResponse, response)
         for an in receivedResponse.answer:
-            self.assertTrue(an.ttl == ttl)
+            self.assertEqual(an.ttl, ttl)
 
         # now we wait a bit for the TTL to decrease
         time.sleep(1)
@@ -2255,7 +2255,7 @@ class TestCachingDontAge(DNSDistTest):
         (_, receivedResponse) = self.sendUDPQuery(query, response=None, useQueue=False)
         self.assertEqual(receivedResponse, response)
         for an in receivedResponse.answer:
-            self.assertTrue(an.ttl == ttl)
+            self.assertEqual(an.ttl, ttl)
 
         total = 0
         for key in self._responsesCounter:

diff --git a/regression-tests.dnsdist/test_DNSCrypt.py b/regression-tests.dnsdist/test_DNSCrypt.py
index 28a35431a130d6027af80067736c5613c539e1a5..7286527524159d95d18af6c1a425bae8e2da7079 100644 (file)
--- a/regression-tests.dnsdist/test_DNSCrypt.py
+++ b/regression-tests.dnsdist/test_DNSCrypt.py
@@ -121,9 +121,9 @@ class TestDNSCrypt(DNSCryptTest):
         self.assertEqual(query, receivedQuery)
         self.assertEqual(receivedResponse.question, response.question)
         self.assertTrue(receivedResponse.flags & ~dns.flags.TC)
-        self.assertTrue(len(receivedResponse.answer) == 0)
-        self.assertTrue(len(receivedResponse.authority) == 0)
-        self.assertTrue(len(receivedResponse.additional) == 0)
+        self.assertEqual(len(receivedResponse.answer), 0)
+        self.assertEqual(len(receivedResponse.authority), 0)
+        self.assertEqual(len(receivedResponse.additional), 0)
 
     def testCertRotation(self):
         """

diff --git a/regression-tests.recursor-dnssec/recursortests.py b/regression-tests.recursor-dnssec/recursortests.py
index 18d897fc984daf6c785f55ba6142a19bec5facbe..249dd66d4d6fc541532724928aaa0e862826e4c1 100644 (file)
--- a/regression-tests.recursor-dnssec/recursortests.py
+++ b/regression-tests.recursor-dnssec/recursortests.py
@@ -1116,10 +1116,10 @@ distributor-threads={threads}
             raise AssertionError("RRSIG found in answers for:\n%s" % ret)
 
     def assertAnswerEmpty(self, msg):
-        self.assertTrue(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])))
+        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 assertAdditionalEmpty(self, msg):
-        self.assertTrue(len(msg.additional) == 0, "Data found in the the additional section for %s:\n%s" % (msg.question[0].to_text(), '\n'.join([i.to_text() for i in msg.additional])))
+        self.assertEqual(len(msg.additional), 0, "Data found in the the additional section for %s:\n%s" % (msg.question[0].to_text(), '\n'.join([i.to_text() for i in msg.additional])))
 
     def assertRcodeEqual(self, msg, rcode):
         if not isinstance(msg, dns.message.Message):

diff --git a/regression-tests.recursor-dnssec/test_Protobuf.py b/regression-tests.recursor-dnssec/test_Protobuf.py
index 0b392f443a2a5fc9fd91ac01b1c1ddd09f5bd55f..894c81ff0bfe5add736a014684f2b13671e4db82 100644 (file)
--- a/regression-tests.recursor-dnssec/test_Protobuf.py
+++ b/regression-tests.recursor-dnssec/test_Protobuf.py
@@ -285,17 +285,17 @@ class TestRecursorProtobuf(RecursorTest):
 
     def checkProtobufIdentity(self, msg, requestorId, deviceId, deviceName):
         #print(msg)
-        self.assertTrue((requestorId == '') == (not msg.HasField('requestorId')))
-        self.assertTrue((deviceId == b'') == (not msg.HasField('deviceId')))
-        self.assertTrue((deviceName == '') == (not msg.HasField('deviceName')))
+        self.assertEqual(requestorId == '', not msg.HasField('requestorId'))
+        self.assertEqual(deviceId == b'', not msg.HasField('deviceId'))
+        self.assertEqual(deviceName == '', not msg.HasField('deviceName'))
         self.assertEqual(msg.requestorId, requestorId)
         self.assertEqual(msg.deviceId, deviceId)
         self.assertEqual(msg.deviceName, deviceName)
 
     def checkProtobufEDE(self, msg, ede, edeText):
         #print(msg)
-        self.assertTrue((ede == 0) == (not msg.HasField('ede')))
-        self.assertTrue((edeText == '') == (not msg.HasField('edeText')))
+        self.assertEqual(ede == 0, not msg.HasField('ede'))
+        self.assertEqual(edeText == '', not msg.HasField('edeText'))
         self.assertEqual(msg.ede, ede)
         self.assertEqual(msg.edeText, edeText)
 
@@ -305,8 +305,8 @@ class TestRecursorProtobuf(RecursorTest):
       return opt
 
     def checkProtobufOT(self, msg, openTelemetryData, openTelemetryTraceID):
-        self.assertTrue(openTelemetryData == msg.HasField('openTelemetryData'))
-        self.assertTrue(openTelemetryTraceID == msg.HasField('openTelemetryTraceID'))
+        self.assertEqual(openTelemetryData, msg.HasField('openTelemetryData'))
+        self.assertEqual(openTelemetryTraceID, msg.HasField('openTelemetryTraceID'))
 
     def setUp(self):
         super(TestRecursorProtobuf, self).setUp()