refactor: enhance fixture definitions and environment setup for garbage collector tests

Author: pcrespov

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

@@ -33,6 +33,12 @@
 from simcore_service_webserver.users.plugin import setup_users
 
 
+@pytest.fixture(scope="session")
+def service_name() -> str:
+    # Overrides  service_name fixture needed in docker_compose_service_environment_dict fixture
+    return "wb-garbage-collector"
+
+
 @pytest.fixture(scope="session")
 def fast_service_deletion_delay() -> int:
     """
@@ -46,20 +52,20 @@ def fast_service_deletion_delay() -> int:
 def app_environment(
     fast_service_deletion_delay: int,
     monkeypatch: pytest.MonkeyPatch,
-    app_environment: EnvVarsDict,
+    docker_compose_service_environment_dict: EnvVarsDict,
+    env_devel_dict: EnvVarsDict,
 ) -> EnvVarsDict:
-    # NOTE: undos some app_environment settings
-    monkeypatch.delenv("WEBSERVER_GARBAGE_COLLECTOR", raising=False)
-    app_environment.pop("WEBSERVER_GARBAGE_COLLECTOR", None)
 
-    return app_environment | setenvs_from_dict(
+    return setenvs_from_dict(
         monkeypatch,
         {
+            **docker_compose_service_environment_dict,
             "WEBSERVER_COMPUTATION": "1",
             "WEBSERVER_NOTIFICATIONS": "1",
             # sets TTL of a resource after logout
             "RESOURCE_MANAGER_RESOURCE_TTL_S": f"{fast_service_deletion_delay}",
-            "GARBAGE_COLLECTOR_INTERVAL_S": "30",
+            #  "WEBSERVER_PROJECTS must be enabled for close_project fixture"
+            "WEBSERVER_PROJECTS": env_devel_dict["WEBSERVER_PROJECTS"],
         },
     )
 
@@ -75,11 +81,8 @@ async def client(
 ) -> TestClient:
     app = create_safe_application()
 
-    assert "WEBSERVER_GARBAGE_COLLECTOR" not in app_environment
-
     settings = setup_settings(app)
     assert settings.WEBSERVER_GARBAGE_COLLECTOR is not None
-    assert settings.WEBSERVER_PROJECTS is not None
 
     setup_db(app)
     setup_session(app)
@@ -88,7 +91,12 @@ async def client(
     setup_login(app)
     setup_users(app)
     setup_socketio(app)
+
+    assert (
+        settings.WEBSERVER_PROJECTS is not None
+    ), "WEBSERVER_PROJECTS must be enabled for close_project fixture"
     assert setup_projects(app)
+
     setup_director_v2(app)
     assert setup_resource_manager(app)
     setup_rabbitmq(app)

services/web/server/tests/unit/with_dbs/04/garbage_collector/test_resource_manager_user_sessions.py

@@ -13,7 +13,9 @@
 from aiohttp import web
 from faker import Faker
 from models_library.users import UserID
+from pytest_mock import MockerFixture
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
+from pytest_simcore.helpers.typing_env import EnvVarsDict
 from servicelib.aiohttp.application import create_safe_application
 from servicelib.aiohttp.application_setup import is_setup_completed
 from simcore_service_webserver.application_settings import setup_settings
@@ -36,12 +38,11 @@
 
 
 @pytest.fixture
-def mock_env_devel_environment(
-    mock_env_devel_environment: dict[str, str],
+def app_environment(
+    app_environment: EnvVarsDict,
     monkeypatch: pytest.MonkeyPatch,
-    faker: Faker,
-):
-    return mock_env_devel_environment | setenvs_from_dict(
+) -> EnvVarsDict:
+    return app_environment | setenvs_from_dict(
         monkeypatch,
         {
             "RESOURCE_MANAGER_RESOURCE_TTL_S": "3",
@@ -51,7 +52,7 @@ def mock_env_devel_environment(
 
 @pytest.fixture
 def redis_enabled_app(
-    redis_client: aioredis.Redis, mocker, mock_env_devel_environment
+    redis_client: aioredis.Redis, mocker: MockerFixture, app_environment: EnvVarsDict
 ) -> web.Application:
     # app.cleanup_ctx.append(redis_client) in setup_redis would create a client and connect
     # to a real redis service. Instead, we mock the get_redis_resources_client access