From 2f01049883912d7602bc6f8c6f4b7d0868b8ead4 Mon Sep 17 00:00:00 2001 From: Tim Pansino Date: Wed, 29 Mar 2023 16:21:17 -0700 Subject: [PATCH] Revert "Fix instance info tests for redis. (#784)" This reverts commit f7108e3c2a54ab02a1104f6c16bd5fd799b9fc7e. --- tests/datastore_redis/test_instance_info.py | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/tests/datastore_redis/test_instance_info.py b/tests/datastore_redis/test_instance_info.py index c2edb31fc..b3e9a0d5d 100644 --- a/tests/datastore_redis/test_instance_info.py +++ b/tests/datastore_redis/test_instance_info.py @@ -100,7 +100,6 @@ 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( [ @@ -116,13 +115,6 @@ 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) @@ -141,10 +133,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 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) 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: @@ -164,10 +153,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 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) 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: