Use TestCase.fail() instead of .assertTrue(False)

https://docs.python.org/3/library/unittest.html#unittest.TestCase.fail

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

diff --git a/regression-tests.dnsdist/quictests.py b/regression-tests.dnsdist/quictests.py
index 9d4b6ee82adad5878d78f63a1d58b1de9bafbf8e..8b5e0ecc375d4e3d69d78f94e576a8ca97bc7547 100644 (file)
--- a/regression-tests.dnsdist/quictests.py
+++ b/regression-tests.dnsdist/quictests.py
@@ -67,7 +67,7 @@ class QUICTests(object):
         query = dns.message.make_query(name, 'A', 'IN')
         try:
             (_, receivedResponse) = self.sendQUICQuery(query, response=None, useQueue=False)
-            self.assertTrue(False)
+            self.fail()
         except StreamResetError as e:
             self.assertEqual(e.error, 5);
 
@@ -112,7 +112,7 @@ class QUICTests(object):
         query = dns.message.make_query(name, 'A', 'IN', use_edns=False)
         try:
             (_, receivedResponse) = self.sendQUICQuery(query, response=None, useQueue=False)
-            self.assertTrue(False)
+            self.fail()
         except StreamResetError as e :
             self.assertEqual(e.error, 5);
 
@@ -127,7 +127,7 @@ class QUICACLTests(object):
         dropped = False
         try:
             (_, receivedResponse) = self.sendQUICQuery(query, response=None, useQueue=False)
-            self.assertTrue(False)
+            self.fail()
         except StreamResetError as e:
             self.assertEqual(e.error, 5);
             dropped = True

diff --git a/regression-tests.dnsdist/test_API.py b/regression-tests.dnsdist/test_API.py
index a008af420f4074112dbdcf9fcf0545a421aa4347..ffaa3fccbb263e12cd91ffe2afc0e9b4615e906e 100644 (file)
--- a/regression-tests.dnsdist/test_API.py
+++ b/regression-tests.dnsdist/test_API.py
@@ -695,7 +695,7 @@ class TestAPIACL(APITestsBase):
         url = 'http://127.0.0.1:' + str(self._webServerPort) + "/"
         try:
             requests.get(url, auth=('whatever', self._webServerBasicAuthPassword), timeout=self._webTimeout)
-            self.assertTrue(False)
+            self.fail()
         except requests.exceptions.ConnectionError as exp:
             pass
 

diff --git a/regression-tests.dnsdist/test_TCPLimits.py b/regression-tests.dnsdist/test_TCPLimits.py
index d210463c0b0abc8af6cad8d830d28c2eec4c50c6..cb81265fcc954ee6eb08799645e3aab9cb2069a1 100644 (file)
--- a/regression-tests.dnsdist/test_TCPLimits.py
+++ b/regression-tests.dnsdist/test_TCPLimits.py
@@ -283,7 +283,7 @@ class TestTCPLimitsTLSNewSessionRate(DNSDistTest):
         try:
             # the next one should be past the max rate
             self.sendDOTQueryWrapper(query, response=None, useQueue=False)
-            self.assertTrue(False)
+            self.fail()
         except ConnectionResetError:
           pass
 
@@ -346,7 +346,7 @@ class TestTCPLimitsTLSResumedSessionRate(DNSDistTest):
             conn = self.openTLSConnection(self._tlsServerPort, self._serverName, self._caCert, timeout=1, sslctx=sslctx, session=session)
             self.sendTCPQueryOverConnection(conn, query, response=response, timeout=1)
             self.recvTCPResponseOverConnection(conn, useQueue=True, timeout=1)
-            self.assertTrue(False)
+            self.fail()
         except ConnectionResetError:
           pass
 

diff --git a/regression-tests.recursor-dnssec/test_API.py b/regression-tests.recursor-dnssec/test_API.py
index 310338f2d4ab7768ef65168228aa463f48823339..c8d06f0153098ff93df4f99d93aecec9a43d6aff 100644 (file)
--- a/regression-tests.recursor-dnssec/test_API.py
+++ b/regression-tests.recursor-dnssec/test_API.py
@@ -50,6 +50,6 @@ api-key=%s
         url = 'http://127.0.0.1:' + str(self._wsPort) + '/api/v1/servers/localhost/statistics'
         try:
             requests.get(url, headers=headers, timeout=self._wsTimeout)
-            self.assertTrue(False)
+            self.fail()
         except requests.exceptions.ConnectionError as exp:
             pass

diff --git a/regression-tests.recursor-dnssec/test_AggressiveNSECCache.py b/regression-tests.recursor-dnssec/test_AggressiveNSECCache.py
index 5ea3ebfdce22d136c4f51a1311c127f7867ff32c..52185563110a346eb87582d5690c89bf79696056 100644 (file)
--- a/regression-tests.recursor-dnssec/test_AggressiveNSECCache.py
+++ b/regression-tests.recursor-dnssec/test_AggressiveNSECCache.py
@@ -46,7 +46,7 @@ class AggressiveNSECCacheBase(RecursorTest):
             if entry['name'] == name:
                 return int(entry['value'])
 
-        self.assertTrue(False)
+        self.fail()
 
     def testNoEDE(self):
         # This isn't an aggresive cache check, but the strcuture is very similar to the others,

diff --git a/regression-tests.recursor-dnssec/test_KeepOpenTCP.py b/regression-tests.recursor-dnssec/test_KeepOpenTCP.py
index cf6b33620985e4341b8b7207486abadc71143f54..26a3307fa368e612f3d16b5d7864a8e1d04c09fe 100644 (file)
--- a/regression-tests.recursor-dnssec/test_KeepOpenTCP.py
+++ b/regression-tests.recursor-dnssec/test_KeepOpenTCP.py
@@ -63,7 +63,7 @@ auth-zones=authzone.example=configs/%s/authzone.zone""" % _confdir
             sock[i].settimeout(0.1)
             try:
                 sock[i].recv(1)
-                self.assertTrue(False)
+                self.fail()
             except socket.timeout as e:
                 print("ok")
 
@@ -76,7 +76,7 @@ auth-zones=authzone.example=configs/%s/authzone.zone""" % _confdir
             sock[i].settimeout(0.1)
             try:
                 sock[i].recv(1)
-                self.assertTrue(False)
+                self.fail()
             except socket.timeout as e:
                 print("ok")
         for i in range(count):