From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Wed, 12 Nov 2025 19:17:36 +0000 (-0500) Subject: Use assertIn X-Git-Tag: rec-5.4.0-alpha1~95^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42b05fc46f5182e5ec93e9d3ba80168cd1dcaf68;p=thirdparty%2Fpdns.git Use assertIn https://docs.python.org/3/library/unittest.html#unittest.TestCase.assertIn 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 1ad1abb2b9..5ffe878f01 100644 --- a/regression-tests.auth-py/authtests.py +++ b/regression-tests.auth-py/authtests.py @@ -492,7 +492,7 @@ options { raise TypeError("msg is not a dns.message.Message") msgFlags = dns.flags.to_text(msg.flags) - self.assertTrue('AD' in msgFlags, "No AD flag found in the message for %s" % msg.question[0].name) + self.assertIn('AD', msgFlags, "No AD flag found in the message for %s" % msg.question[0].name) def assertRRsetInAnswer(self, msg, rrset): """Asserts the rrset (without comparing TTL) exists in the diff --git a/regression-tests.dnsdist/test_API.py b/regression-tests.dnsdist/test_API.py index 72529696bb..3da966fd14 100644 --- a/regression-tests.dnsdist/test_API.py +++ b/regression-tests.dnsdist/test_API.py @@ -154,7 +154,7 @@ class TestAPIBasics(APITestsBase): 'qps', 'queries', 'order', 'tcpLatency', 'responses', 'nonCompliantResponses']: self.assertGreaterEqual(server[key], 0) - self.assertTrue(server['state'] in ['up', 'down', 'UP', 'DOWN']) + self.assertIn(server['state'], ['up', 'down', 'UP', 'DOWN']) for frontend in content['frontends']: for key in ['id', 'address', 'udp', 'tcp', 'type', 'queries', 'nonCompliantQueries']: @@ -211,7 +211,7 @@ class TestAPIBasics(APITestsBase): 'qps', 'queries', 'order', 'tcpLatency', 'responses', 'nonCompliantResponses']: self.assertGreaterEqual(server[key], 0) - self.assertTrue(server['state'] in ['up', 'down', 'UP', 'DOWN']) + self.assertIn(server['state'], ['up', 'down', 'UP', 'DOWN']) def testServersIDontExist(self): """ @@ -542,7 +542,7 @@ class TestAPICustomHeaders(APITestsBase): self.assertTrue(r) self.assertEqual(r.status_code, 200) self.assertEqual(r.headers.get('x-powered-by'), "dnsdist") - self.assertTrue("x-frame-options" in r.headers) + self.assertIn("x-frame-options", r.headers) class TestStatsWithoutAuthentication(APITestsBase): __test__ = True diff --git a/regression-tests.dnsdist/test_DOH.py b/regression-tests.dnsdist/test_DOH.py index 7df517e7e7..8727590249 100644 --- a/regression-tests.dnsdist/test_DOH.py +++ b/regression-tests.dnsdist/test_DOH.py @@ -89,11 +89,11 @@ class DOHTests(object): self.assertTrue(receivedResponse) receivedQuery.id = expectedQuery.id self.assertEqual(expectedQuery, receivedQuery) - self.assertTrue((self._customResponseHeader1) in self._response_headers.decode()) - self.assertTrue((self._customResponseHeader2) in self._response_headers.decode()) + self.assertIn(self._customResponseHeader1, self._response_headers.decode()) + self.assertIn(self._customResponseHeader2, self._response_headers.decode()) self.assertFalse(('UPPERCASE: VaLuE' in self._response_headers.decode())) - self.assertTrue(('uppercase: VaLuE' in self._response_headers.decode())) - self.assertTrue(('cache-control: max-age=3600' in self._response_headers.decode())) + self.assertIn('uppercase: VaLuE', self._response_headers.decode()) + self.assertIn('cache-control: max-age=3600', self._response_headers.decode()) self.checkQueryEDNSWithoutECS(expectedQuery, receivedQuery) self.assertEqual(response, receivedResponse) self.checkHasHeader('cache-control', 'max-age=3600') @@ -694,7 +694,7 @@ class DOHTests(object): self.assertTrue(receivedResponse) self.assertEqual(receivedResponse, b'Plaintext answer') self.assertEqual(self._rcode, 200) - self.assertTrue('content-type: text/plain' in self._response_headers.decode()) + self.assertIn('content-type: text/plain', self._response_headers.decode()) def testHTTPStatusAction307(self): """ @@ -707,7 +707,7 @@ class DOHTests(object): (_, receivedResponse) = self.sendDOHQuery(self._dohServerPort, self._serverName, self._dohBaseURL, query, caFile=self._caCert, useQueue=False, rawResponse=True) self.assertTrue(receivedResponse) self.assertEqual(self._rcode, 307) - self.assertTrue('location: https://doh.powerdns.org' in self._response_headers.decode()) + self.assertIn('location: https://doh.powerdns.org', self._response_headers.decode()) def testHTTPLuaResponse(self): """ @@ -721,7 +721,7 @@ class DOHTests(object): self.assertTrue(receivedResponse) self.assertEqual(receivedResponse, b'It works!') self.assertEqual(self._rcode, 200) - self.assertTrue('content-type: text/plain' in self._response_headers.decode()) + self.assertIn('content-type: text/plain', self._response_headers.decode()) def testHTTPEarlyResponse(self): """ @@ -1495,7 +1495,7 @@ class DOHFFI(object): self.assertTrue(receivedResponse) self.assertEqual(receivedResponse, b'It works!') self.assertEqual(self._rcode, 200) - self.assertTrue('content-type: text/plain' in self._response_headers.decode()) + self.assertIn('content-type: text/plain', self._response_headers.decode()) class TestDOHFFINGHTTP2(DOHFFI, DNSDistDOHTest): _dohLibrary = 'nghttp2' diff --git a/regression-tests.dnsdist/test_OpenTelemetryTracing.py b/regression-tests.dnsdist/test_OpenTelemetryTracing.py index 49d991f6a0..a7fe3d489c 100644 --- a/regression-tests.dnsdist/test_OpenTelemetryTracing.py +++ b/regression-tests.dnsdist/test_OpenTelemetryTracing.py @@ -90,7 +90,7 @@ class DNSDistOpenTelemetryProtobufBaseTest(DNSDistOpenTelemetryProtobufTest): # Ensure all attributes exist for field in ot_data["resource_spans"][0]["resource"]["attributes"]: - self.assertTrue(field["key"] in ["service.name"]) + self.assertIn(field["key"], ["service.name"]) # Ensure the values are correct # TODO: query.remote with port diff --git a/regression-tests.dnsdist/test_SNMP.py b/regression-tests.dnsdist/test_SNMP.py index 34552a03e2..c7859ac090 100644 --- a/regression-tests.dnsdist/test_SNMP.py +++ b/regression-tests.dnsdist/test_SNMP.py @@ -27,7 +27,7 @@ class TestSNMP(DNSDistTest): def _checkStatsValues(self, results, queriesCountersValue): for i in list(range(1, 5)) + list(range(6, 20)) + list(range(24, 35)) + [ 35 ] : oid = self._snmpOID + '.1.' + str(i) + '.0' - self.assertTrue(oid in results) + self.assertIn(oid, results) self.assertTrue(isinstance(results[oid], Counter64)) for i in range(20, 23): diff --git a/regression-tests.recursor-dnssec/recursortests.py b/regression-tests.recursor-dnssec/recursortests.py index 249dd66d4d..689be83739 100644 --- a/regression-tests.recursor-dnssec/recursortests.py +++ b/regression-tests.recursor-dnssec/recursortests.py @@ -969,7 +969,7 @@ distributor-threads={threads} raise TypeError("msg is not a dns.message.Message") msgFlags = dns.flags.to_text(msg.flags) - self.assertTrue('AD' in msgFlags, "No AD flag found in the message for %s" % msg.question[0].name) + self.assertIn('AD', msgFlags, "No AD flag found in the message for %s" % msg.question[0].name) def assertRRsetInAnswer(self, msg, rrset): """Asserts the rrset (without comparing TTL) exists in the diff --git a/regression-tests.recursor-dnssec/test_Protobuf.py b/regression-tests.recursor-dnssec/test_Protobuf.py index 894c81ff0b..f673db1051 100644 --- a/regression-tests.recursor-dnssec/test_Protobuf.py +++ b/regression-tests.recursor-dnssec/test_Protobuf.py @@ -244,7 +244,7 @@ class TestRecursorProtobuf(RecursorTest): #print(msg.response.tags) self.assertEqual(len(msg.response.tags), len(tags)) for tag in msg.response.tags: - self.assertTrue(tag in tags) + self.assertIn(tag, tags) def checkProtobufMetas(self, msg, metas): #print(metas) @@ -254,11 +254,11 @@ class TestRecursorProtobuf(RecursorTest): for m in msg.meta: self.assertTrue(m.HasField('key')) self.assertTrue(m.HasField('value')) - self.assertTrue(m.key in metas) + self.assertIn(m.key, metas) for i in m.value.intVal : - self.assertTrue(i in metas[m.key]['intVal']) + self.assertIn(i, metas[m.key]['intVal']) for s in m.value.stringVal : - self.assertTrue(s in metas[m.key]['stringVal']) + self.assertIn(s, metas[m.key]['stringVal']) def checkProtobufOutgoingQuery(self, msg, protocol, query, qclass, qtype, qname, initiator='127.0.0.1', length=None, expectedECS=None): self.assertEqual(msg.type, dnsmessage_pb2.PBDNSMessage.DNSOutgoingQueryType) @@ -1526,7 +1526,7 @@ auth-zones=example=configs/%s/example.zone""" % _confdir self.checkProtobufResponse(msg, dnsmessage_pb2.PBDNSMessage.UDP, res, '127.0.0.1', receivedSize=len(raw)) self.assertEqual(len(msg.response.rrs), 5) for rr in msg.response.rrs: - self.assertTrue(rr.type in [dns.rdatatype.AAAA, dns.rdatatype.TXT, dns.rdatatype.MX, dns.rdatatype.SPF, dns.rdatatype.SRV]) + self.assertIn(rr.type, [dns.rdatatype.AAAA, dns.rdatatype.TXT, dns.rdatatype.MX, dns.rdatatype.SPF, dns.rdatatype.SRV]) if rr.type == dns.rdatatype.AAAA: self.checkProtobufResponseRecord(rr, dns.rdataclass.IN, dns.rdatatype.AAAA, name, 15) diff --git a/regression-tests.recursor-dnssec/test_SNMP.py b/regression-tests.recursor-dnssec/test_SNMP.py index 34088ba8d3..c25ecb7301 100644 --- a/regression-tests.recursor-dnssec/test_SNMP.py +++ b/regression-tests.recursor-dnssec/test_SNMP.py @@ -24,7 +24,7 @@ class SNMPTest(RecursorTest): count = 161 for i in list(range(1, count)): oid = self._snmpOID + '.1.' + str(i) + '.0' - self.assertTrue(oid in results) + self.assertIn(oid, results) self.assertTrue(isinstance(results[oid], Counter64)) oid = self._snmpOID + '.1.' + str(count + 1) + '.0'