engine

Author: pcrespov

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

@@ -8,7 +8,7 @@
 from servicelib.aiohttp.application_keys import APP_AIOPG_ENGINE_KEY
 from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
 
-from . import _aiopg
+from . import _aiopg, _asyncpg
 
 _logger = logging.getLogger(__name__)
 
@@ -20,6 +20,10 @@
 is_service_enabled = _aiopg.is_service_enabled
 
 
+# asyncpg helpers
+get_asyncpg_engine = _asyncpg.get_async_engine
+
+
 @app_module_setup(
     "simcore_service_webserver.db",
     ModuleCategory.ADDON,
@@ -34,3 +38,4 @@ def setup_db(app: web.Application):
 
     # init engines
     app.cleanup_ctx.append(_aiopg.postgres_cleanup_ctx)
+    app.cleanup_ctx.append(_asyncpg.postgres_cleanup_ctx)

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

@@ -7,12 +7,9 @@
 
 import aiopg.sa
 import asyncpg
-import pytest
 import sqlalchemy as sa
 import yaml
-from aiohttp import web
 from aiohttp.test_utils import TestServer
-from pytest_mock import MockFixture, MockType
 from simcore_service_webserver.application_settings import (
     ApplicationSettings,
     get_application_settings,
@@ -21,36 +18,12 @@
 from simcore_service_webserver.db.plugin import (
     is_service_enabled,
     is_service_responsive,
-    setup_db,
 )
 from simcore_service_webserver.login.storage import AsyncpgStorage, get_plugin_storage
 from sqlalchemy.ext.asyncio import AsyncEngine
 
 
-@pytest.fixture
-def mock_asyncpg_in_setup_db(mocker: MockFixture) -> MockType:
-
-    original_setup = setup_db
-
-    mock_setup_db = mocker.patch(
-        "simcore_service_webserver.application.setup_db", autospec=True
-    )
-
-    def _wrapper_setup_db(app: web.Application):
-        original_setup(app)
-
-        # NEW engine !
-        app.cleanup_ctx.append(_asyncpg.postgres_cleanup_ctx)
-
-    mock_setup_db.side_effect = _wrapper_setup_db
-    return mock_setup_db
-
-
-async def test_all_pg_engines_in_app(
-    mock_asyncpg_in_setup_db: MockType, web_server: TestServer
-):
-    assert mock_asyncpg_in_setup_db.called
-
+async def test_all_pg_engines_in_app(web_server: TestServer):
     app = web_server.app
     assert app