From 4c85d5825d1b46b5a65c96bf889fd787548edd53 Mon Sep 17 00:00:00 2001 From: Roy Jacobson Date: Mon, 31 Jul 2023 10:48:36 +0200 Subject: [PATCH] tests: Add a password to TLS configurations (#1603) Add a password to TLS configurations --- tests/dragonfly/connection_test.py | 10 +++++++--- tests/dragonfly/replication_test.py | 7 +++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tests/dragonfly/connection_test.py b/tests/dragonfly/connection_test.py index 5ada88897..26247f2e9 100644 --- a/tests/dragonfly/connection_test.py +++ b/tests/dragonfly/connection_test.py @@ -439,17 +439,21 @@ async def test_large_cmd(async_client: aioredis.Redis): @pytest.mark.asyncio async def test_reject_non_tls_connections_on_tls(with_tls_server_args, df_local_factory): server = df_local_factory.create( - no_tls_on_admin_port="true", admin_port=1111, port=1211, **with_tls_server_args + no_tls_on_admin_port="true", + admin_port=1111, + port=1211, + requirepass="XXX", + **with_tls_server_args, ) server.start() - client = aioredis.Redis(port=server.port) + client = aioredis.Redis(port=server.port, password="XXX") try: await client.execute_command("DBSIZE") except redis_conn_error: pass - client = aioredis.Redis(port=server.admin_port) + client = aioredis.Redis(port=server.admin_port, password="XXX") assert await client.dbsize() == 0 await client.close() diff --git a/tests/dragonfly/replication_test.py b/tests/dragonfly/replication_test.py index e20b6e3c1..b4c55ee0b 100644 --- a/tests/dragonfly/replication_test.py +++ b/tests/dragonfly/replication_test.py @@ -1274,10 +1274,11 @@ async def test_no_tls_on_admin_port( admin_port=ADMIN_PORT, **with_tls_server_args, port=BASE_PORT, + requirepass="XXX", proactor_threads=t_master, ) master.start() - c_master = aioredis.Redis(port=master.admin_port) + c_master = aioredis.Redis(port=master.admin_port, password="XXX") await c_master.execute_command("DEBUG POPULATE 100") db_size = await c_master.execute_command("DBSIZE") assert 100 == db_size @@ -1289,9 +1290,11 @@ async def test_no_tls_on_admin_port( **with_tls_server_args, port=BASE_PORT + 1, proactor_threads=t_replica, + requirepass="XXX", + masterauth="XXX", ) replica.start() - c_replica = aioredis.Redis(port=replica.admin_port) + c_replica = aioredis.Redis(port=replica.admin_port, password="XXX") res = await c_replica.execute_command("REPLICAOF localhost " + str(master.admin_port)) assert b"OK" == res await check_all_replicas_finished([c_replica], c_master)