refactor: update service_name fixture and logging in environment mocks

Author: pcrespov

services/web/server/tests/conftest.py

@@ -95,6 +95,13 @@
 ]
 
 
+@pytest.fixture(scope="session")
+def service_name() -> str:
+    # Overrides  service_name fixture needed in docker_compose_service_environment_dict fixture
+    # NOTE: this can be used to setup configs for different webserver service variants e.g. wg-api-server, wg-garbage-collector, etc
+    return "webserver"
+
+
 @pytest.fixture
 async def exit_stack() -> AsyncIterator[contextlib.AsyncExitStack]:
     """Provides an AsyncExitStack that gets cleaned up after each test"""

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

@@ -5,6 +5,7 @@
 
 
 import json
+import logging
 import os
 import random
 from pathlib import Path
@@ -186,12 +187,15 @@ def mock_webserver_service_environment(
     mock_env_devel_environment: EnvVarsDict,
     mock_env_dockerfile_build: EnvVarsDict,
     mock_env_deployer_pipeline: EnvVarsDict,
+    mock_webserver_service_environment: EnvVarsDict,
     service_name: str,
 ) -> EnvVarsDict:
     """
     Mocks environment produce in the docker compose config with a .env (.env-devel)
     and launched with a makefile
     """
+    logging.getLogger().info("Composing %s service environment ... ", service_name)
+
     # @docker compose config (overrides)
     # TODO: get from docker compose config
     # r'- ([A-Z2_]+)=\$\{\1:-([\w-]+)\}'
@@ -228,18 +232,23 @@ def mock_webserver_service_environment(
             "SWARM_STACK_NAME": os.environ.get("SWARM_STACK_NAME", "simcore"),
             "WEBSERVER_LOGLEVEL": os.environ.get("LOG_LEVEL", "WARNING"),
             "SESSION_COOKIE_MAX_AGE": str(7 * 24 * 60 * 60),
-            "WEBSERVER_RPC_NAMESPACE": service_name,
+            **mock_webserver_service_environment,
         },
     )
 
-    return (
+    envs = (
         mock_env_makefile
         | mock_env_devel_environment
         | mock_env_dockerfile_build
         | mock_env_deployer_pipeline
         | mock_envs_docker_compose_environment
     )
 
+    logging.getLogger().info(
+        "%s service environment:\n%s", service_name, json.dumps(envs, indent=1)
+    )
+    return envs
+
 
 @pytest.fixture
 def mocked_login_required(mocker: MockerFixture):

services/web/server/tests/unit/isolated/test_rest.py

@@ -24,8 +24,7 @@ async def client(
     unused_tcp_port_factory: Callable,
     aiohttp_client: Callable[..., Awaitable[TestClient]],
     api_version_prefix: str,
-    mock_env_devel_environment: EnvVarsDict,
-    mock_env_deployer_pipeline: EnvVarsDict,
+    mock_webserver_service_environment: EnvVarsDict,
     mocked_db_setup_in_setup_security: MockType,
 ) -> TestClient:
     app = create_safe_application()

services/web/server/tests/unit/with_dbs/03/login/test_login_utils_emails.py

@@ -12,6 +12,7 @@
 from aiohttp.test_utils import make_mocked_request
 from faker import Faker
 from pytest_mock import MockerFixture
+from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from simcore_service_webserver.application_settings import setup_settings
 from simcore_service_webserver.constants import RQ_PRODUCT_KEY
@@ -27,7 +28,12 @@
 
 
 @pytest.fixture
-def app(mock_env_devel_environment: EnvVarsDict) -> web.Application:
+def app(
+    docker_compose_service_environment_dict: EnvVarsDict,
+    monkeypatch: pytest.MonkeyPatch,
+) -> web.Application:
+
+    setenvs_from_dict(monkeypatch, {**docker_compose_service_environment_dict})
 
     # app_environment: EnvVarsDict) -> web.Application:
     app_ = web.Application()

services/web/server/tests/unit/with_dbs/03/test_session_access_policies.py

@@ -31,7 +31,7 @@
 @pytest.fixture
 async def client(
     aiohttp_client: Callable,
-    mock_env_devel_environment: EnvVarsDict,
+    mock_webserver_service_environment: EnvVarsDict,
 ) -> TestClient:
     routes = web.RouteTableDef()
 

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

@@ -7,12 +7,6 @@
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 
 
-@pytest.fixture(scope="session")
-def service_name() -> str:
-    # Overrides  service_name fixture needed in docker_compose_service_environment_dict fixture
-    return "webserver"
-
-
 @pytest.fixture
 def app_environment(
     app_environment: dict[str, str], monkeypatch: pytest.MonkeyPatch