diff options
author | Chayim <chayim@users.noreply.github.com> | 2021-12-16 09:36:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-16 09:36:56 +0200 |
commit | 18c6809b761bc6755349e1d7e08e74e857ec2c65 (patch) | |
tree | 29ba60b2d00dbc999981e2def8a51fd0a07a9e6a /tests/conftest.py | |
parent | a8b8f142399a62e64c3003adda2d9563eea95ef4 (diff) | |
download | redis-py-18c6809b761bc6755349e1d7e08e74e857ec2c65.tar.gz |
Support for password-encrypted SSL private keys (#1782)
Adding support for SSL private keys with a password. This PR also adds support for future SSL tests.
Diffstat (limited to 'tests/conftest.py')
-rw-r--r-- | tests/conftest.py | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index 4b5f6cb..0149166 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -14,8 +14,10 @@ from redis.retry import Retry REDIS_INFO = {} default_redis_url = "redis://localhost:6379/9" - default_redismod_url = "redis://localhost:36379" + +# default ssl client ignores verification for the purpose of testing +default_redis_ssl_url = "rediss://localhost:6666" default_cluster_nodes = 6 @@ -37,6 +39,13 @@ def pytest_addoption(parser): ) parser.addoption( + "--redis-ssl-url", + default=default_redis_ssl_url, + action="store", + help="Redis SSL connection string," " defaults to `%(default)s`", + ) + + parser.addoption( "--redis-cluster-nodes", default=default_cluster_nodes, action="store", @@ -248,6 +257,12 @@ def r2(request): yield client +@pytest.fixture() +def sslclient(request): + with _get_client(redis.Redis, request, ssl=True) as client: + yield client + + def _gen_cluster_mock_resp(r, response): connection = Mock() connection.retry = Retry(NoBackoff(), 0) |