From 26a2c20a0a74fb041821c892a7ddcc430b0be523 Mon Sep 17 00:00:00 2001 From: Uma Annamalai Date: Mon, 20 Mar 2023 15:09:35 -0700 Subject: [PATCH 1/2] Fix instance info tests for redis. --- tests/datastore_redis/test_instance_info.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/datastore_redis/test_instance_info.py b/tests/datastore_redis/test_instance_info.py index b3e9a0d5d..ca6b92375 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,12 @@ 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 +140,7 @@ 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 +160,7 @@ 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: From b3f2a9501e41a834c3ae09d4e9b77db91cf065ec Mon Sep 17 00:00:00 2001 From: umaannamalai Date: Mon, 20 Mar 2023 22:13:20 +0000 Subject: [PATCH 2/2] [Mega-Linter] Apply linters fixes --- tests/datastore_redis/test_instance_info.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tests/datastore_redis/test_instance_info.py b/tests/datastore_redis/test_instance_info.py index ca6b92375..c2edb31fc 100644 --- a/tests/datastore_redis/test_instance_info.py +++ b/tests/datastore_redis/test_instance_info.py @@ -117,10 +117,11 @@ 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")),] + _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") @@ -140,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 if REDIS_PY_VERSION < (4, 5, 2) else _instance_info_from_url_tests_4_5_2) +@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: @@ -160,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 if REDIS_PY_VERSION < (4, 5, 2) else _instance_info_from_url_tests_4_5_2) +@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: