From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Wed, 12 Nov 2025 19:16:06 +0000 (-0500) Subject: Use assertNotIn X-Git-Tag: rec-5.4.0-alpha1~95^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F16481%2Fhead;p=thirdparty%2Fpdns.git Use assertNotIn https://docs.python.org/3/library/unittest.html#unittest.TestCase.assertNotIn Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- diff --git a/regression-tests.dnsdist/test_API.py b/regression-tests.dnsdist/test_API.py index 3da966fd14..939c018146 100644 --- a/regression-tests.dnsdist/test_API.py +++ b/regression-tests.dnsdist/test_API.py @@ -529,7 +529,7 @@ class TestAPICustomHeaders(APITestsBase): self.assertTrue(r) self.assertEqual(r.status_code, 200) self.assertEqual(r.headers.get('x-custom'), "custom") - self.assertFalse("x-frame-options" in r.headers) + self.assertNotIn("x-frame-options", r.headers) def testBasicHeadersUpdate(self): """ diff --git a/regression-tests.dnsdist/test_DOH.py b/regression-tests.dnsdist/test_DOH.py index 8727590249..c1017c526d 100644 --- a/regression-tests.dnsdist/test_DOH.py +++ b/regression-tests.dnsdist/test_DOH.py @@ -91,7 +91,7 @@ class DOHTests(object): self.assertEqual(expectedQuery, receivedQuery) 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.assertNotIn('UPPERCASE: VaLuE', 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) diff --git a/regression-tests.recursor-dnssec/test_SNMP.py b/regression-tests.recursor-dnssec/test_SNMP.py index c25ecb7301..2826386475 100644 --- a/regression-tests.recursor-dnssec/test_SNMP.py +++ b/regression-tests.recursor-dnssec/test_SNMP.py @@ -28,7 +28,7 @@ class SNMPTest(RecursorTest): self.assertTrue(isinstance(results[oid], Counter64)) oid = self._snmpOID + '.1.' + str(count + 1) + '.0' - self.assertFalse(oid in results) + self.assertNotIn(oid, results) # check uptime > 0 self.assertGreater(results['1.3.6.1.4.1.43315.2.1.75.0'], 0)