much faster tests

Author: sanderegg

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

@@ -10,7 +10,6 @@
 import tenacity
 from pytest_mock import MockerFixture
 from redis.asyncio import Redis, from_url
-from servicelib.redis import _constants as redis_constants
 from settings_library.basic_types import PortInt
 from settings_library.redis import RedisDatabase, RedisSettings
 from tenacity.before_sleep import before_sleep_log
@@ -119,6 +118,6 @@ async def wait_till_redis_responsive(redis_url: URL | str) -> None:
 @pytest.fixture
 def mock_redis_socket_timeout(mocker: MockerFixture) -> None:
     # lowered to allow CI to properly shutdown RedisClientSDK instances
-    mocker.patch.object(
-        redis_constants, "DEFAULT_SOCKET_TIMEOUT", timedelta(seconds=0.25)
+    mocker.patch(
+        "servicelib.redis._client.DEFAULT_SOCKET_TIMEOUT", timedelta(seconds=0.25)
     )

packages/service-library/src/servicelib/redis/_client.py

@@ -11,19 +11,16 @@
 from redis.asyncio.retry import Retry
 from redis.backoff import ExponentialBackoff
 from servicelib.async_utils import cancel_wait_task
-from tenacity import retry
-from yarl import URL
+from servicelib.background_task import periodic
 
 from ..logging_utils import log_catch
-from ..retry_policies import RedisRetryPolicyUponInitialization
 from ._constants import (
     DEFAULT_DECODE_RESPONSES,
     DEFAULT_HEALTH_CHECK_INTERVAL,
     DEFAULT_LOCK_TTL,
     DEFAULT_SOCKET_TIMEOUT,
     SHUTDOWN_TIMEOUT_S,
 )
-from ._errors import CouldNotConnectToRedisError
 
 _logger = logging.getLogger(__name__)
 
@@ -52,27 +49,24 @@ def __post_init__(self) -> None:
             retry_on_error=[
                 redis.exceptions.BusyLoadingError,
                 redis.exceptions.ConnectionError,
-                redis.exceptions.TimeoutError,
             ],
+            retry_on_timeout=True,
             socket_timeout=DEFAULT_SOCKET_TIMEOUT.total_seconds(),
-            socket_connect_timeout=DEFAULT_SOCKET_TIMEOUT.total_seconds(),
             encoding="utf-8",
             decode_responses=self.decode_responses,
             client_name=self.client_name,
         )
+        # NOTE: connection is done here already
+        self._is_healthy = True
 
-    @retry(**RedisRetryPolicyUponInitialization(_logger).kwargs)
-    async def setup(self) -> None:
-        if not await self.ping():
-            await self.shutdown()
-            url_safe = URL(self.redis_dsn).with_password("???")
-            raise CouldNotConnectToRedisError(dsn=f"{url_safe}")
+        @periodic(interval=self.health_check_interval)
+        async def _periodic_check_health() -> None:
+            self._is_healthy = await self.ping()
 
         self._health_check_task = asyncio.create_task(
-            self._check_health(),
+            _periodic_check_health(),
             name=f"redis_service_health_check_{self.redis_dsn}__{uuid4()}",
         )
-        self._is_healthy = True
 
         _logger.info(
             "Connection to %s succeeded with %s",
@@ -96,14 +90,6 @@ async def ping(self) -> bool:
             return True
         return False
 
-    async def _check_health(self) -> None:
-        sleep_s = self.health_check_interval.total_seconds()
-
-        while self._continue_health_checking:
-            with log_catch(_logger, reraise=False):
-                self._is_healthy = await self.ping()
-            await asyncio.sleep(sleep_s)
-
     @property
     def is_healthy(self) -> bool:
         """Returns the result of the last health check.

packages/service-library/src/servicelib/redis/_clients_manager.py

@@ -27,9 +27,6 @@ async def setup(self) -> None:
                 client_name=f"{self.client_name}",
             )
 
-        for client in self._client_sdks.values():
-            await client.setup()
-
     async def shutdown(self) -> None:
         # NOTE: somehow using logged_gather is not an option
         # doing so will make the shutdown procedure hang

packages/service-library/tests/conftest.py

@@ -87,7 +87,6 @@ async def _(
         assert client
         assert client.redis_dsn == redis_resources_dns
         assert client.client_name == "pytest"
-        await client.setup()
 
         yield client
 

packages/service-library/tests/deferred_tasks/test_deferred_tasks.py

@@ -22,7 +22,6 @@
 from pytest_mock import MockerFixture
 from servicelib.rabbitmq import RabbitMQClient
 from servicelib.redis import RedisClientSDK
-from servicelib.redis import _constants as redis_client_constants
 from servicelib.sequences_utils import partition_gen
 from settings_library.rabbit import RabbitSettings
 from settings_library.redis import RedisSettings
@@ -389,9 +388,8 @@ async def pause_redis(self) -> AsyncIterator[None]:
 
 @pytest.fixture
 def mock_default_socket_timeout(mocker: MockerFixture) -> None:
-    mocker.patch.object(
-        redis_client_constants,
-        "DEFAULT_SOCKET_TIMEOUT",
+    mocker.patch(
+        "servicelib.redis._client.DEFAULT_SOCKET_TIMEOUT",
         datetime.timedelta(seconds=0.25),
     )
 

packages/service-library/tests/redis/test_client.py

@@ -113,11 +113,6 @@ async def test_redis_client_sdk_setup_shutdown(
     assert client
     assert client.redis_dsn == redis_resources_dns
 
-    # ensure nothing happens if shutdown is called before setup
-    await client.shutdown()
-
-    await client.setup()
-
     # ensure health check task sets the health to True
     client._is_healthy = False  # noqa: SLF001
     async for attempt in AsyncRetrying(