rm app_cfg

Author: pcrespov

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

@@ -9,6 +9,7 @@
 
 import pytest
 from aioresponses import aioresponses
+from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from pytest_simcore.helpers.webserver_login import UserInfoDict
 from pytest_simcore.helpers.webserver_projects import NewProject, delete_all_projects
@@ -40,21 +41,21 @@
 @pytest.fixture
 def app_environment(
     monkeypatch: pytest.MonkeyPatch,
-    app_cfg: AppConfigDict,
     app_environment: EnvVarsDict,
-    monkeypatch_setenv_from_app_config: Callable[[AppConfigDict], EnvVarsDict],
 ) -> EnvVarsDict:
-    cfg = deepcopy(app_cfg)
-
-    cfg["projects"]["enabled"] = True
-    cfg["resource_manager"][
-        "garbage_collection_interval_seconds"
-    ] = DEFAULT_GARBAGE_COLLECTOR_INTERVAL_SECONDS  # increase speed of garbage collection
-    cfg["resource_manager"][
-        "resource_deletion_timeout_seconds"
-    ] = DEFAULT_GARBAGE_COLLECTOR_DELETION_TIMEOUT_SECONDS  # reduce deletion delay
+    # NOTE: undos some app_environment settings
+    monkeypatch.delenv("WEBSERVER_GARBAGE_COLLECTOR", raising=False)
+    app_environment.pop("WEBSERVER_GARBAGE_COLLECTOR", None)
 
-    return app_environment | monkeypatch_setenv_from_app_config(cfg)
+    return app_environment | setenvs_from_dict(
+        monkeypatch,
+        {
+            # reduce deletion delay
+            "RESOURCE_MANAGER_RESOURCE_TTL_S": f"{DEFAULT_GARBAGE_COLLECTOR_INTERVAL_SECONDS}",
+            # increase speed of garbage collection
+            "GARBAGE_COLLECTOR_INTERVAL_S": f"{DEFAULT_GARBAGE_COLLECTOR_DELETION_TIMEOUT_SECONDS}",
+        },
+    )
 
 
 @pytest.fixture
@@ -68,10 +69,13 @@ def client(
     mock_orphaned_services,
     redis_client,  # this ensure redis is properly cleaned
 ):
-    # config app
     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
     assert settings.WEBSERVER_TAGS is not None
 
     # setup app

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

@@ -2,11 +2,8 @@
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 
-import logging
 from collections.abc import AsyncIterator, Awaitable, Callable
-from copy import deepcopy
 from pathlib import Path
-from typing import Any
 from unittest import mock
 from uuid import UUID
 
@@ -21,6 +18,8 @@
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from pytest_mock import MockerFixture
 from pytest_simcore.helpers.faker_factories import random_project
+from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
+from pytest_simcore.helpers.typing_env import EnvVarsDict
 from pytest_simcore.helpers.webserver_login import UserInfoDict
 from pytest_simcore.helpers.webserver_projects import NewProject
 from servicelib.aiohttp import status
@@ -31,7 +30,6 @@
 from simcore_service_webserver._meta import API_VTAG as VX
 from simcore_service_webserver.db.models import UserRole
 from simcore_service_webserver.db.plugin import APP_AIOPG_ENGINE_KEY
-from simcore_service_webserver.log import setup_logging
 from simcore_service_webserver.projects.db import ProjectDBAPI
 from simcore_service_webserver.projects.models import ProjectDict
 from tenacity.asyncio import AsyncRetrying
@@ -69,70 +67,35 @@ def catalog_subsystem_mock_override(
 
 
 @pytest.fixture
-def app_cfg(
-    default_app_cfg,
-    unused_tcp_port_factory,
+def app_environment(
     catalog_subsystem_mock_override: None,
-    monkeypatch,
-) -> dict[str, Any]:
-    """App's configuration used for every test in this module
-
-    NOTE: Overrides services/web/server/tests/unit/with_dbs/conftest.py::app_cfg to influence app setup
-    """
-    cfg = deepcopy(default_app_cfg)
-
-    monkeypatch.setenv("WEBSERVER_DEV_FEATURES_ENABLED", "1")
-
-    cfg["main"]["port"] = unused_tcp_port_factory()
-    cfg["main"]["studies_access_enabled"] = True
-
-    exclude = {
-        "activity",
-        "clusters",
-        "computation",
-        "diagnostics",
-        "groups",
-        "publications",
-        "garbage_collector",
-        "smtp",
-        "socketio",
-        "storage",
-        "studies_dispatcher",
-        "tags",
-        "tracing",
-    }
-    include = {
-        "catalog",
-        "db",
-        "login",
-        "products",
-        "projects",
-        "resource_manager",
-        "rest",
-        "users",
-        "version_control",  # MODULE UNDER TEST
-    }
-
-    assert include.intersection(exclude) == set()
-
-    for section in include:
-        cfg[section]["enabled"] = True
-    for section in exclude:
-        cfg[section]["enabled"] = False
-
-    # NOTE: To see logs, use pytest -s --log-cli-level=DEBUG
-    setup_logging(
-        level=logging.DEBUG,
-        log_format_local_dev_enabled=True,
-        logger_filter_mapping={},
-        tracing_settings=None,
+    monkeypatch: pytest.MonkeyPatch,
+    app_environment: EnvVarsDict,
+) -> EnvVarsDict:
+
+    return app_environment | setenvs_from_dict(
+        monkeypatch,
+        {
+            # exclude
+            "WEBSERVER_ACTIVITY": "null",
+            "WEBSERVER_CLUSTERS": "null",
+            "WEBSERVER_COMPUTATION": "null",
+            "WEBSERVER_DIAGNOSTICS": "null",
+            "WEBSERVER_GROUPS": "0",
+            "WEBSERVER_PUBLICATIONS": "0",
+            "WEBSERVER_GARBAGE_COLLECTOR": "null",
+            "WEBSERVER_SMTP": "null",
+            "WEBSERVER_SOCKETIO": "0",
+            "WEBSERVER_STORAGE": "null",
+            "WEBSERVER_STUDIES_DISPATCHER": "null",
+            "WEBSERVER_TAGS": "0",
+            "WEBSERVER_TRACING": "null",
+            # Module under test
+            "WEBSERVER_DEV_FEATURES_ENABLED": "1",
+            "WEBSERVER_VERSION_CONTROL": "1",
+        },
     )
 
-    # Enforces smallest GC in the background task
-    cfg["resource_manager"]["garbage_collection_interval_seconds"] = 1
-
-    return cfg
-
 
 @pytest.fixture
 async def user_id(logged_user: UserInfoDict) -> UserID:

services/web/server/tests/unit/with_dbs/03/version_control/test_version_control_handlers.py

@@ -1,6 +1,8 @@
 # pylint: disable=redefined-outer-name
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
+# pylint: disable=too-many-arguments
+
 
 from collections.abc import Awaitable, Callable
 from http import HTTPStatus
@@ -23,7 +25,7 @@
 )
 
 
-async def assert_resp_page(
+async def _assert_resp_page(
     resp: aiohttp.ClientResponse,
     expected_page_cls: type[Page],
     expected_total: int,
@@ -38,7 +40,7 @@ async def assert_resp_page(
     return page
 
 
-async def assert_status_and_body(
+async def _assert_status_and_body(
     resp, expected_cls: HTTPStatus, expected_model: type[BaseModel]
 ) -> BaseModel:
     data, _ = await assert_status(resp, expected_cls)
@@ -84,7 +86,7 @@ async def test_workflow(
     #
     # this project now has a repo
     resp = await client.get(f"/{VX}/repos/projects")
-    page = await assert_resp_page(
+    page = await _assert_resp_page(
         resp, expected_page_cls=Page[ProjectDict], expected_total=1, expected_count=1
     )
 
@@ -97,8 +99,8 @@ async def test_workflow(
     assert CheckpointApiModel.model_validate(data) == checkpoint1
 
     # TODO: GET checkpoint with tag
+    resp = await client.get(f"/{VX}/repos/projects/{project_uuid}/checkpoints/v1")
     with pytest.raises(aiohttp.ClientResponseError) as excinfo:
-        resp = await client.get(f"/{VX}/repos/projects/{project_uuid}/checkpoints/v1")
         resp.raise_for_status()
 
     assert CheckpointApiModel.model_validate(data) == checkpoint1
@@ -114,7 +116,7 @@ async def test_workflow(
 
     # LIST checkpoints
     resp = await client.get(f"/{VX}/repos/projects/{project_uuid}/checkpoints")
-    page = await assert_resp_page(
+    page = await _assert_resp_page(
         resp,
         expected_page_cls=Page[CheckpointApiModel],
         expected_total=1,
@@ -226,7 +228,7 @@ async def test_delete_project_and_repo(
 
     # LIST
     resp = await client.get(f"/{VX}/repos/projects/{project_uuid}/checkpoints")
-    await assert_resp_page(
+    await _assert_resp_page(
         resp,
         expected_page_cls=Page[CheckpointApiModel],
         expected_total=1,
@@ -247,7 +249,7 @@ async def test_delete_project_and_repo(
 
     # LIST empty
     resp = await client.get(f"/{VX}/repos/projects/{project_uuid}/checkpoints")
-    await assert_resp_page(
+    await _assert_resp_page(
         resp,
         expected_page_cls=Page[CheckpointApiModel],
         expected_total=0,