setup_db

Author: pcrespov

services/web/server/src/simcore_service_webserver/security/plugin.py

@@ -12,8 +12,8 @@
 import aiohttp_security  # type: ignore[import-untyped]
 from aiohttp import web
 from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
-from simcore_service_webserver.db.plugin import setup_db
 
+from ..db.plugin import setup_db
 from ..session.plugin import setup_session
 from ._authz_access_model import RoleBasedAccessModel
 from ._authz_access_roles import ROLES_PERMISSIONS

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

@@ -4,8 +4,10 @@
 from pathlib import Path
 
 import pytest
+import simcore_service_webserver
+import simcore_service_webserver.security
 from faker import Faker
-from pytest_mock import MockerFixture
+from pytest_mock import MockerFixture, MockType
 from pytest_simcore.helpers.monkeypatch_envs import (
     setenvs_from_dict,
     setenvs_from_envfile,
@@ -257,3 +259,16 @@ def mocked_login_required(mocker: MockerFixture):
         spec=True,
         return_value="osparc",
     )
+
+
+@pytest.fixture
+def mocked_db_setup_in_setup_security(mocker: MockerFixture) -> MockType:
+    """Mocking avoids setting up a full db"""
+    import simcore_service_webserver.security.plugin
+
+    return mocker.patch.object(
+        simcore_service_webserver.security.plugin,
+        "setup_db",
+        autospec=True,
+        return_value=True,
+    )

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

@@ -10,7 +10,7 @@
 import pytest
 from aiohttp.client_exceptions import ClientConnectionError
 from aiohttp.test_utils import TestClient
-from pytest_mock import MockerFixture
+from pytest_mock import MockerFixture, MockType
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
@@ -22,7 +22,6 @@
     setup_settings,
 )
 from simcore_service_webserver.rest.plugin import setup_rest
-from simcore_service_webserver.security.plugin import setup_security
 from simcore_service_webserver.session.plugin import setup_session
 
 
@@ -101,14 +100,8 @@ async def client(
     aiohttp_client: Callable[..., Awaitable[TestClient]],
     mock_orphaned_services: MagicMock,
     app_environment: EnvVarsDict,
-    mocker: MockerFixture,
+    mocked_db_setup_in_setup_security: MockType,
 ):
-    setup_db_mock = mocker.patch(
-        "simcore_service_webserver.security.plugin.setup_db",
-        autospec=True,
-        return_value=True,
-    )
-
     # app_environment are in place
     assert {key: os.environ[key] for key in app_environment} == app_environment
     expected_activity_settings = PrometheusSettings.create_from_envs()
@@ -118,14 +111,10 @@ async def client(
     settings = setup_settings(app)
     assert expected_activity_settings == settings.WEBSERVER_ACTIVITY
 
-    assert not setup_db_mock.called
-
     setup_session(app)
-    setup_security(app)
-
-    assert setup_db_mock.called
-
     setup_rest(app)
+    assert mocked_db_setup_in_setup_security.called
+
     assert setup_activity(app)
 
     return await aiohttp_client(app)

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

@@ -14,6 +14,7 @@
 import simcore_service_webserver
 from aiohttp import web
 from aiohttp.test_utils import TestClient
+from pytest_mock import MockType
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
@@ -29,7 +30,6 @@
 from simcore_service_webserver.diagnostics.plugin import setup_diagnostics
 from simcore_service_webserver.diagnostics.settings import DiagnosticsSettings
 from simcore_service_webserver.rest.plugin import setup_rest
-from simcore_service_webserver.security.plugin import setup_security
 from tenacity import retry
 from tenacity.before import before_log
 from tenacity.stop import stop_after_attempt
@@ -104,6 +104,7 @@ def mock_environment(
 
 @pytest.fixture
 async def client(
+    mocked_db_setup_in_setup_security: MockType,
     unused_tcp_port_factory: Callable,
     aiohttp_client: Callable[..., Awaitable[TestClient]],
     api_version_prefix: str,
@@ -155,7 +156,6 @@ async def delay_response(request: web.Request):
 
     # activates some sub-modules
     assert setup_settings(app)
-    setup_security(app)
     setup_rest(app)
 
     setup_diagnostics(app)

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

@@ -9,7 +9,7 @@
 import pytest
 from aiohttp import web
 from aiohttp.test_utils import TestClient
-from pytest_mock import MockerFixture
+from pytest_mock import MockerFixture, MockType
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from servicelib.aiohttp import status
@@ -26,6 +26,7 @@ async def client(
     api_version_prefix: str,
     mock_env_devel_environment: EnvVarsDict,
     mock_env_deployer_pipeline: EnvVarsDict,
+    mocked_db_setup_in_setup_security: MockType,
 ) -> TestClient:
     app = create_safe_application()
 

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

@@ -18,7 +18,7 @@
 from models_library.emails import LowerCaseEmailStr
 from models_library.products import ProductName
 from pydantic import TypeAdapter
-from pytest_mock import MockerFixture
+from pytest_mock import MockerFixture, MockType
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from servicelib.aiohttp import status
 from simcore_postgres_database.models.products import LOGIN_SETTINGS_DEFAULT, products
@@ -214,6 +214,7 @@ async def client(
     ],
     app_routes: RouteTableDef,
     mock_env_devel_environment: EnvVarsDict,
+    mocked_db_setup_in_setup_security: MockType,
 ):
     app = web.Application()
     app.router.add_routes(app_routes)
@@ -227,7 +228,9 @@ async def client(
         return_value=session_settings,
     )
 
+    assert not mocked_db_setup_in_setup_security.called
     setup_security(app)
+    assert mocked_db_setup_in_setup_security.called
 
     # mocks 'setup_products': patch to avoid database
     set_products_in_app_state(app, app_products)