adjust tests with the new context manager

Author: amirreza8002

tests/acceptance/conftest.py

@@ -6,17 +6,18 @@
 
 
 @pytest.fixture
-async def valkey_cache(valkey_client):
+async def valkey_cache(valkey_config):
     from aiocache.backends.valkey import ValkeyCache
 
-    async with ValkeyCache(namespace="test", client=valkey_client) as cache:
+    async with ValkeyCache(namespace="test", config=valkey_config) as cache:
         yield cache
         await asyncio.gather(*(cache.delete(k) for k in (*Keys, KEY_LOCK)))
 
 
 @pytest.fixture
 async def memory_cache():
     from aiocache.backends.memory import SimpleMemoryCache
+
     async with SimpleMemoryCache(namespace="test") as cache:
         yield cache
         await asyncio.gather(*(cache.delete(k) for k in (*Keys, KEY_LOCK)))
@@ -25,6 +26,7 @@ async def memory_cache():
 @pytest.fixture
 async def memcached_cache():
     from aiocache.backends.memcached import MemcachedCache
+
     async with MemcachedCache(namespace="test") as cache:
         yield cache
         await asyncio.gather(*(cache.delete(k) for k in (*Keys, KEY_LOCK)))

tests/conftest.py

@@ -12,12 +12,20 @@ def decode_responses():
 
 
 @pytest.fixture
-async def valkey_client(max_conns, decode_responses):
-    from glide import GlideClient, GlideClientConfiguration, NodeAddress
+def valkey_config():
+    from glide import GlideClientConfiguration, NodeAddress
 
     addresses = [NodeAddress("localhost", 6379)]
     conf = GlideClientConfiguration(addresses=addresses, database_id=0)
-    client = await GlideClient.create(conf)
+
+    yield conf
+
+
+@pytest.fixture
+async def valkey_client(max_conns, decode_responses, valkey_config):
+    from glide import GlideClient
+
+    client = await GlideClient.create(valkey_config)
 
     yield client
 

tests/performance/conftest.py

@@ -2,16 +2,18 @@
 
 
 @pytest.fixture
-async def valkey_cache(valkey_client):
+async def valkey_cache(valkey_config):
     # valkey connection pool raises ConnectionError but doesn't wait for conn reuse
     # when exceeding max pool size.
     from aiocache.backends.valkey import ValkeyCache
-    async with ValkeyCache(namespace="test", client=valkey_client) as cache:
+
+    async with ValkeyCache(namespace="test", config=valkey_config) as cache:
         yield cache
 
 
 @pytest.fixture
 async def memcached_cache():
     from aiocache.backends.memcached import MemcachedCache
+
     async with MemcachedCache(namespace="test", pool_size=1) as cache:
         yield cache

tests/ut/backends/test_valkey.py

@@ -55,9 +55,7 @@ async def test_set(self, valkey):
 
     async def test_set_cas_token(self, mocker, valkey):
         mocker.patch.object(valkey, "_cas")
-        await valkey._set(
-            Keys.KEY, "value", _cas_token="old_value", _conn=valkey.client
-        )
+        await valkey._set(Keys.KEY, "value", _cas_token="old_value", _conn=valkey.client)
         valkey._cas.assert_called_with(
             Keys.KEY, "value", "old_value", ttl=None, _conn=valkey.client
         )
@@ -219,9 +217,7 @@ def test_parse_uri_path(self, path, expected, valkey_client):
             ["my_ns", "my_ns:" + ensure_key(Keys.KEY)],
         ),  # noqa: B950
     )
-    def test_build_key_double_dot(
-        self, set_test_namespace, valkey_cache, namespace, expected
-    ):
+    def test_build_key_double_dot(self, set_test_namespace, valkey_cache, namespace, expected):
         assert valkey_cache.build_key(Keys.KEY, namespace) == expected
 
     def test_build_key_no_namespace(self, valkey_cache):

tests/ut/conftest.py

@@ -55,10 +55,10 @@ def base_cache():
 
 
 @pytest.fixture
-async def valkey_cache(valkey_client):
+async def valkey_cache(valkey_config):
     from aiocache.backends.valkey import ValkeyCache
 
-    async with ValkeyCache(client=valkey_client) as cache:
+    async with ValkeyCache(config=valkey_config) as cache:
         yield cache