rm app_cfg and monkeypatch_setenv_from_app_config

Author: pcrespov

services/web/server/tests/unit/with_dbs/01/test_groups_handlers_classifers.py

@@ -1,61 +1,50 @@
-# pylint:disable=unused-variable
-# pylint:disable=unused-argument
-# pylint:disable=redefined-outer-name
+# pylint: disable=redefined-outer-name
+# pylint: disable=unused-argument
+# pylint: disable=unused-variable
+# pylint: disable=too-many-arguments
 
 import re
-from copy import deepcopy
 
 import pytest
 from aiohttp import web_exceptions
 from aioresponses.core import aioresponses
-from simcore_service_webserver.application_settings_utils import AppConfigDict
+from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
+from pytest_simcore.helpers.typing_env import EnvVarsDict
 
 
 @pytest.fixture
-def app_cfg(default_app_cfg: AppConfigDict, unused_tcp_port_factory):
-    """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)
-
-    cfg["main"]["port"] = unused_tcp_port_factory()
-    cfg["main"]["studies_access_enabled"] = True
-
-    exclude = {
-        "tracing",
-        "smtp",
-        "storage",
-        "activity",
-        "diagnostics",
-        "tags",
-        "publications",
-        "catalog",
-        "computation",
-        "products",
-        "socketio",
-        "resource_manager",
-        "projects",
-        "login",
-        "users",
-    }
-    include = {
-        "db",
-        "rest",
-        "groups",
-    }
-
-    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)
-
-    return cfg
+def app_environment(
+    monkeypatch: pytest.MonkeyPatch,
+    app_environment: EnvVarsDict,
+) -> EnvVarsDict:
+
+    monkeypatch.delenv("WEBSERVER_STUDIES_DISPATCHER", raising=False)
+    app_environment.pop("WEBSERVER_STUDIES_DISPATCHER", None)
+
+    return app_environment | setenvs_from_dict(
+        monkeypatch,
+        {
+            # exclude
+            "WEBSERVER_ACTIVITY": "null",
+            "WEBSERVER_CATALOG": "null",
+            "WEBSERVER_CLUSTERS": "null",
+            "WEBSERVER_COMPUTATION": "null",
+            "WEBSERVER_DIAGNOSTICS": "null",
+            "WEBSERVER_EMAIL": "null",
+            "WEBSERVER_GARBAGE_COLLECTOR": "null",
+            "WEBSERVER_GROUPS": "0",
+            "WEBSERVER_LOGIN": "null",
+            "WEBSERVER_PRODUCTS": "0",
+            "WEBSERVER_PROJECTS": "null",
+            "WEBSERVER_PUBLICATIONS": "0",
+            "WEBSERVER_SOCKETIO": "0",
+            "WEBSERVER_STORAGE": "null",
+            "WEBSERVER_RESOURCE_MANAGER": "null",
+            "WEBSERVER_TAGS": "0",
+            "WEBSERVER_TRACING": "null",
+            "WEBSERVER_USERS": "null",
+        },
+    )
 
 
 @pytest.mark.skip(reason="UNDER DEV: test_group_handlers")

services/web/server/tests/unit/with_dbs/01/test_statics.py

@@ -16,7 +16,6 @@
 from servicelib.aiohttp import status
 from servicelib.aiohttp.application import create_safe_application
 from simcore_postgres_database.models.products import products
-from simcore_service_webserver._meta import API_VTAG
 from simcore_service_webserver.application_settings import setup_settings
 from simcore_service_webserver.application_settings_utils import AppConfigDict
 from simcore_service_webserver.db.plugin import setup_db
@@ -55,25 +54,18 @@ def client(
     aiohttp_client: Callable,
     app_cfg: AppConfigDict,
     postgres_db: sa.engine.Engine,
-    monkeypatch_setenv_from_app_config: Callable,
 ) -> TestClient:
     cfg = deepcopy(app_cfg)
-
     port = cfg["main"]["port"]
 
-    assert cfg["rest"]["version"] == API_VTAG
-    monkeypatch_setenv_from_app_config(cfg)
-
-    # fake config
-    app = create_safe_application(cfg)
+    app = create_safe_application()
 
     settings = setup_settings(app)
-    print(settings.model_dump_json(indent=1))
-
+    assert settings.WEBSERVER_STATICWEB
     setup_rest(app)
     setup_db(app)
     setup_products(app)
-    setup_statics(app)
+    assert setup_statics(app)
 
     return event_loop.run_until_complete(
         aiohttp_client(app, server_kwargs={"port": port, "host": "localhost"})

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

@@ -1,80 +1,43 @@
 # pylint: disable=redefined-outer-name
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
-
-import logging
-from copy import deepcopy
-from typing import Any
-
+# pylint: disable=too-many-arguments
 import pytest
+from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
+from pytest_simcore.helpers.typing_env import EnvVarsDict
 from simcore_postgres_database.models.users import UserRole
-from simcore_service_webserver.log import setup_logging
 
 
 @pytest.fixture
 def user_role() -> UserRole:
-    # TODO: user rights still not in place
     return UserRole.TESTER
 
 
 @pytest.fixture
-def app_cfg(default_app_cfg, unused_tcp_port_factory, 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",
-        "garbage_collector",
-        "groups",
-        "publications",
-        "smtp",
-        "socketio",
-        "storage",
-        "studies_dispatcher",
-        "tags",
-        "tracing",
-    }
-    include = {
-        "catalog",
-        "db",
-        "login",
-        "meta_modeling",  # MODULE UNDER TEST
-        "products",
-        "projects",
-        "redis",
-        "resource_manager",
-        "rest",
-        "users",
-        "version_control",
-    }
-
-    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,
+def app_environment(
+    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_EMAIL": "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",
+            "WEBSERVER_META_MODELING": "1",
+        },
     )
-
-    # Enforces smallest GC in the background task
-    cfg["resource_manager"]["garbage_collection_interval_seconds"] = 1
-
-    return cfg

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

@@ -2,16 +2,20 @@
 # pylint:disable=unused-argument
 # pylint:disable=redefined-outer-name
 
+import asyncio
 from collections.abc import AsyncIterator, Callable
 from copy import deepcopy
 from pathlib import Path
 
 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
 from servicelib.aiohttp.application import create_safe_application
 from simcore_service_webserver.application_settings import setup_settings
+from simcore_service_webserver.application_settings_utils import AppConfigDict
 from simcore_service_webserver.db.plugin import setup_db
 from simcore_service_webserver.director_v2.plugin import setup_director_v2
 from simcore_service_webserver.login.plugin import setup_login
@@ -34,33 +38,45 @@
 DEFAULT_GARBAGE_COLLECTOR_DELETION_TIMEOUT_SECONDS: int = 3
 
 
+@pytest.fixture
+def app_environment(
+    monkeypatch: pytest.MonkeyPatch,
+    app_environment: 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(
+        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
 def client(
-    event_loop,
-    aiohttp_client,
-    app_cfg,
+    event_loop: asyncio.AbstractEventLoop,
+    aiohttp_client: Callable,
+    app_cfg: AppConfigDict,
+    app_environment: EnvVarsDict,
     postgres_db,
     mocked_dynamic_services_interface,
     mock_orphaned_services,
     redis_client,  # this ensure redis is properly cleaned
-    monkeypatch_setenv_from_app_config: Callable,
 ):
-    # config app
-    cfg = deepcopy(app_cfg)
-    port = cfg["main"]["port"]
-    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
-
-    monkeypatch_setenv_from_app_config(cfg)
+    app = create_safe_application()
 
-    app = create_safe_application(cfg)
+    assert "WEBSERVER_GARBAGE_COLLECTOR" not in app_environment
 
-    assert setup_settings(app)
+    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
     setup_db(app)
@@ -71,14 +87,16 @@ def client(
     setup_resource_manager(app)
     setup_socketio(app)
     setup_director_v2(app)
-    setup_tags(app)
-    assert setup_projects(app)
+    assert setup_tags(app)
+    setup_projects(app)
     setup_products(app)
     setup_wallets(app)
 
     # server and client
     return event_loop.run_until_complete(
-        aiohttp_client(app, server_kwargs={"port": port, "host": "localhost"})
+        aiohttp_client(
+            app, server_kwargs={"port": app_cfg["main"]["port"], "host": "localhost"}
+        )
     )
 
     # teardown here ...