From fbb851e75d0456a0138c0265ba431d54856f5111 Mon Sep 17 00:00:00 2001 From: Uma Annamalai Date: Mon, 20 Mar 2023 15:26:13 -0700 Subject: [PATCH] Fix instance info tests for redis. (#784) * Fix instance info tests for redis. * [Mega-Linter] Apply linters fixes --------- Co-authored-by: umaannamalai --- tests/datastore_redis/test_instance_info.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/tests/datastore_redis/test_instance_info.py b/tests/datastore_redis/test_instance_info.py index b3e9a0d5d..c2edb31fc 100644 --- a/tests/datastore_redis/test_instance_info.py +++ b/tests/datastore_redis/test_instance_info.py @@ -100,6 +100,7 @@ def test_strict_redis_connection_instance_info(args, kwargs, expected): if (3, 5, 3) >= REDIS_PY_VERSION >= (2, 7, 5): _instance_info_from_url_tests.append((("redis://127.0.0.1",), {}, ("127.0.0.1", "6379", "0"))) + if REDIS_PY_VERSION >= (2, 10): _instance_info_from_url_tests.extend( [ @@ -115,6 +116,13 @@ def test_strict_redis_connection_instance_info(args, kwargs, expected): ] ) +if REDIS_PY_VERSION >= (4, 5, 2): + _instance_info_from_url_tests_4_5_2 = _instance_info_from_url_tests[:-3] + [ + (("unix:///path/to/socket.sock",), {}, ("localhost", "6379", "0")), + (("unix:///path/to/socket.sock?db=2",), {}, ("localhost", "6379", "2")), + (("unix:///path/to/socket.sock",), {"db": 2}, ("localhost", "6379", "2")), + ] + @pytest.mark.skipif(REDIS_PY_VERSION < (2, 6), reason="from_url not yet implemented in this redis-py version") @pytest.mark.parametrize("args,kwargs,expected", _instance_info_from_url_tests) @@ -133,7 +141,10 @@ def test_strict_redis_client_from_url(args, kwargs, expected): @pytest.mark.skipif(REDIS_PY_VERSION < (2, 6), reason="from_url not yet implemented in this redis-py version") -@pytest.mark.parametrize("args,kwargs,expected", _instance_info_from_url_tests) +@pytest.mark.parametrize( + "args,kwargs,expected", + _instance_info_from_url_tests if REDIS_PY_VERSION < (4, 5, 2) else _instance_info_from_url_tests_4_5_2, +) def test_redis_connection_from_url(args, kwargs, expected): r = redis.Redis.from_url(*args, **kwargs) if r.connection_pool.connection_class is redis.Connection: @@ -153,7 +164,10 @@ def test_redis_connection_from_url(args, kwargs, expected): @pytest.mark.skipif(REDIS_PY_VERSION < (2, 6), reason="from_url not yet implemented in this redis-py version") -@pytest.mark.parametrize("args,kwargs,expected", _instance_info_from_url_tests) +@pytest.mark.parametrize( + "args,kwargs,expected", + _instance_info_from_url_tests if REDIS_PY_VERSION < (4, 5, 2) else _instance_info_from_url_tests_4_5_2, +) def test_strict_redis_connection_from_url(args, kwargs, expected): r = redis.StrictRedis.from_url(*args, **kwargs) if r.connection_pool.connection_class is redis.Connection: