upgrade usage of aioredis

packages/pytest-simcore/src/pytest_simcore/redis_service.py

@@ -58,13 +58,14 @@ async def redis_client(
     redis_settings: RedisSettings,
 ) -> AsyncIterator[aioredis.Redis]:
     """Creates a redis client to communicate with a redis service ready"""
-    client = await aioredis.create_redis_pool(redis_settings.dsn, encoding="utf-8")
+    client = aioredis.from_url(
+        redis_settings.dsn, encoding="utf-8", decode_responses=True
+    )
 
     yield client
 
     await client.flushall()
-    client.close()
-    await client.wait_closed()
+    await client.disconnect()
 
 
 # HELPERS --
@@ -77,6 +78,12 @@ async def redis_client(
     reraise=True,
 )
 async def wait_till_redis_responsive(redis_url: Union[URL, str]) -> None:
-    client = await aioredis.create_redis_pool(str(redis_url), encoding="utf-8")
-    client.close()
-    await client.wait_closed()
+    try:
+        client = aioredis.from_url(
+            f"{redis_url}", encoding="utf-8", decode_responses=True
+        )
+
+        if not await client.ping():
+            raise ConnectionError(f"{redis_url=} not available")
+    finally:
+        await client.disconnect()

services/web/server/src/simcore_service_webserver/redis.py

@@ -48,7 +48,13 @@ async def _create_client(address: str) -> aioredis.Redis:
             reraise=True,
         ):
             with attempt:
-                client = await aioredis.create_redis_pool(address, encoding="utf-8")
+                client = aioredis.from_url(
+                    redis_settings.dsn, encoding="utf-8", decode_responses=True
+                )
+                if not await client.ping():
+                    raise ConnectionError(
+                        f"Connection to {redis_settings.dsn!r} failed"
+                    )
                 log.info(
                     "Connection to %s succeeded with %s [%s]",
                     f"redis at {address=}",
@@ -89,10 +95,8 @@ async def _create_client(address: str) -> aioredis.Redis:
         log.critical("Invalid redis lock manager in app")
 
     # close clients
-    client.close()
-    await client.wait_closed()
-    client_lock_db.close()
-    await client_lock_db.wait_closed()
+    await client.disconnect()
+    await client_lock_db.disconnect()
     # delete lock manager
     await lock_manager.destroy()
 

services/web/server/tests/integration/01/test_exporter.py

@@ -125,10 +125,11 @@ def __drop_and_recreate_postgres__(
 
 @pytest.fixture(autouse=True)
 async def __delete_all_redis_keys__(redis_settings: RedisSettings):
-    client = await aioredis.create_redis_pool(redis_settings.dsn, encoding="utf-8")
+    client = aioredis.from_url(
+        redis_settings.dsn, encoding="utf-8", decode_responses=True
+    )
     await client.flushall()
-    client.close()
-    await client.wait_closed()
+    await client.disconnect()
 
     yield
     # do nothing on teadown

services/web/server/tests/integration/01/test_garbage_collection.py

@@ -71,10 +71,11 @@ def __drop_and_recreate_postgres__(database_from_template_before_each_function)
 
 @pytest.fixture(autouse=True)
 async def __delete_all_redis_keys__(redis_settings: RedisSettings):
-    client = await aioredis.create_redis_pool(redis_settings.dsn, encoding="utf-8")
+    client = aioredis.from_url(
+        redis_settings.dsn, encoding="utf-8", decode_responses=True
+    )    
     await client.flushall()
-    client.close()
-    await client.wait_closed()
+    await client.disconnect()
 
     yield
     # do nothing on teadown

services/web/server/tests/unit/with_dbs/conftest.py

@@ -357,12 +357,13 @@ def redis_service(docker_services, docker_ip) -> URL:
 
 @pytest.fixture
 async def redis_client(redis_service: URL):
-    client = await aioredis.create_redis_pool(str(redis_service), encoding="utf-8")
+    client = aioredis.from_url(
+        f"{redis_service}", encoding="utf-8", decode_responses=True
+    )
     yield client
 
     await client.flushall()
-    client.close()
-    await client.wait_closed()
+    await client.disconnect()
 
 
 def _is_redis_responsive(host: str, port: int) -> bool: