Skip to content

Commit e013954

Browse files
committed
Changing ssl verify flag used for testing - the current one was not available in python 3.9
1 parent aaca2cf commit e013954

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

tests/test_asyncio/test_ssl.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ async def test_ssl_flags_config_applied_to_context(self, request):
6565
# Test with specific SSL verify flags
6666
ssl_verify_flags_config = [
6767
(ssl.VerifyFlags.VERIFY_X509_STRICT, False), # Disable strict verification
68-
(ssl.VerifyFlags.VERIFY_X509_PARTIAL_CHAIN, True), # Enable partial chain
68+
(ssl.VerifyFlags.VERIFY_CRL_CHECK_CHAIN, True), # Enable partial chain
6969
]
7070

7171
r = redis.Redis(
@@ -125,10 +125,10 @@ def capture_context_create_default():
125125
captured_context.options & ssl.VerifyFlags.VERIFY_X509_STRICT
126126
), "VERIFY_X509_STRICT should be disabled but is enabled"
127127

128-
# Verify that VERIFY_X509_PARTIAL_CHAIN was enabled (bit set)
128+
# Verify that VERIFY_CRL_CHECK_CHAIN was enabled (bit set)
129129
assert (
130-
captured_context.options & ssl.VerifyFlags.VERIFY_X509_PARTIAL_CHAIN
131-
), "VERIFY_X509_PARTIAL_CHAIN should be enabled but is disabled"
130+
captured_context.options & ssl.VerifyFlags.VERIFY_CRL_CHECK_CHAIN
131+
), "VERIFY_CRL_CHECK_CHAIN should be enabled but is disabled"
132132

133133
finally:
134134
await r.aclose()

tests/test_connection_pool.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -539,12 +539,12 @@ def get_connection(self):
539539
return self.make_connection()
540540

541541
pool = DummyConnectionPool.from_url(
542-
"rediss://?ssl_verify_flags_config=[(VERIFY_X509_STRICT,False), (VERIFY_X509_PARTIAL_CHAIN,True)]"
542+
"rediss://?ssl_verify_flags_config=[(VERIFY_X509_STRICT,False), (VERIFY_CRL_CHECK_CHAIN,True)]"
543543
)
544544

545545
assert pool.get_connection().ssl_verify_flags_config == [
546546
(ssl.VerifyFlags.VERIFY_X509_STRICT, False),
547-
(ssl.VerifyFlags.VERIFY_X509_PARTIAL_CHAIN, True),
547+
(ssl.VerifyFlags.VERIFY_CRL_CHECK_CHAIN, True),
548548
]
549549

550550
def test_ssl_flags_config_invalid_flag(self):
@@ -554,12 +554,12 @@ def get_connection(self):
554554

555555
with pytest.raises(ValueError):
556556
DummyConnectionPool.from_url(
557-
"rediss://?ssl_verify_flags_config=[(VERIFY_X509,False), (VERIFY_X509_PARTIAL_CHAIN,True)]"
557+
"rediss://?ssl_verify_flags_config=[(VERIFY_X509,False), (VERIFY_CRL_CHECK_CHAIN,True)]"
558558
)
559559

560560
with pytest.raises(ValueError):
561561
DummyConnectionPool.from_url(
562-
"rediss://?ssl_verify_flags_config=[(VERIFY_X509_STRICT,Ok), (VERIFY_X509_PARTIAL_CHAIN,True)]"
562+
"rediss://?ssl_verify_flags_config=[(VERIFY_X509_STRICT,Ok), (VERIFY_CRL_CHECK_CHAIN,True)]"
563563
)
564564

565565

tests/test_ssl.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ def test_ssl_verify_flags_config_applied_to_context(self, request):
337337
# Test with specific SSL verify flags
338338
ssl_verify_flags_config = [
339339
(ssl.VerifyFlags.VERIFY_X509_STRICT, False), # Disable strict verification
340-
(ssl.VerifyFlags.VERIFY_X509_PARTIAL_CHAIN, True), # Enable partial chain
340+
(ssl.VerifyFlags.VERIFY_CRL_CHECK_CHAIN, True), # Enable partial chain
341341
]
342342

343343
r = redis.Redis(
@@ -403,10 +403,10 @@ def capture_context_wrap_socket(context_self, sock, **_kwargs):
403403
captured_context.options & ssl.VerifyFlags.VERIFY_X509_STRICT
404404
), "VERIFY_X509_STRICT should be disabled but is enabled"
405405

406-
# Verify that VERIFY_X509_PARTIAL_CHAIN was enabled (bit set)
406+
# Verify that VERIFY_CRL_CHECK_CHAIN was enabled (bit set)
407407
assert (
408-
captured_context.options & ssl.VerifyFlags.VERIFY_X509_PARTIAL_CHAIN
409-
), "VERIFY_X509_PARTIAL_CHAIN should be enabled but is disabled"
408+
captured_context.options & ssl.VerifyFlags.VERIFY_CRL_CHECK_CHAIN
409+
), "VERIFY_CRL_CHECK_CHAIN should be enabled but is disabled"
410410

411411
finally:
412412
mock_sock.close()

0 commit comments

Comments
 (0)