Skip to content

Commit d6792b5

Browse files
committed
Fix ssl tests
1 parent dd3f650 commit d6792b5

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

tests/conftest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ def pytest_sessionstart(session):
184184
REDIS_INFO["version"] = version
185185
REDIS_INFO["arch_bits"] = arch_bits
186186
REDIS_INFO["cluster_enabled"] = cluster_enabled
187+
REDIS_INFO["tls_cert_subdir"] = "cluster" if cluster_enabled else "standalone"
187188
REDIS_INFO["enterprise"] = enterprise
188189
# store REDIS_INFO in config so that it is available from "condition strings"
189190
session.config.REDIS_INFO = REDIS_INFO

tests/test_ssl.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,12 @@ class TestSSL:
1919
"""
2020

2121
@pytest.fixture(autouse=True)
22-
def _set_ssl_certs(self):
23-
self.client_certs = get_tls_certificates()
24-
self.server_certs = get_tls_certificates(cert_type=CertificateType.server)
22+
def _set_ssl_certs(self, request):
23+
tls_cert_subdir = request.session.config.REDIS_INFO["tls_cert_subdir"]
24+
self.client_certs = get_tls_certificates(tls_cert_subdir)
25+
self.server_certs = get_tls_certificates(
26+
tls_cert_subdir, cert_type=CertificateType.server
27+
)
2528

2629
def test_ssl_with_invalid_cert(self, request):
2730
ssl_url = request.config.option.redis_ssl_url

0 commit comments

Comments
 (0)