fixed test

Author: sanderegg

services/director-v2/src/simcore_service_director_v2/modules/dask_client.py

@@ -53,7 +53,6 @@
 from models_library.users import UserID
 from pydantic import TypeAdapter, ValidationError
 from pydantic.networks import AnyUrl
-from servicelib.fastapi.db_asyncpg_engine import get_engine
 from servicelib.logging_utils import log_catch
 from settings_library.s3 import S3Settings
 from simcore_sdk.node_ports_common.exceptions import NodeportsException
@@ -80,6 +79,7 @@
     TaskHandlers,
     connect_to_dask_scheduler,
 )
+from .db import get_db_engine
 
 _logger = logging.getLogger(__name__)
 
@@ -362,7 +362,7 @@ async def send_computation_tasks(
             try:
                 # This instance is created only once so it can be reused in calls below
                 node_ports = await dask_utils.create_node_ports(
-                    db_engine=get_engine(self.app),
+                    db_engine=get_db_engine(self.app),
                     user_id=user_id,
                     project_id=project_id,
                     node_id=node_id,

services/director-v2/tests/unit/conftest.py

@@ -46,11 +46,17 @@
 
 @pytest.fixture
 def disable_postgres(mocker) -> None:
+    fake_engine = mock.AsyncMock()
+
     def mock_setup(app: FastAPI, *args, **kwargs) -> None:
-        app.state.engine = mock.AsyncMock()
-        app.state.asyncpg_engine = mock.AsyncMock()
+        app.state.engine = fake_engine
 
     mocker.patch("simcore_service_director_v2.modules.db.setup", side_effect=mock_setup)
+    for module in [
+        "simcore_service_director_v2.modules.db",
+        "simcore_service_director_v2.modules.dask_client",
+    ]:
+        mocker.patch(f"{module}.get_db_engine", return_value=fake_engine)
 
 
 @pytest.fixture

services/director-v2/tests/unit/test_modules_dask_client.py

@@ -189,7 +189,7 @@ async def dask_client(
     }[request.param]()
 
     try:
-        assert client.app.state.asyncpg_engine is not None
+        assert client.app.state.engine is not None
 
         # check we can run some simple python script
         def _square(x):
@@ -207,8 +207,8 @@ def neg(x):
         result = await future
         assert result == -285
     except AttributeError:
-        # enforces existance of 'app.state.asyncpg_engine' and sets to None
-        client.app.state.asyncpg_engine = None
+        # enforces existance of 'app.state.engine' and sets to None
+        client.app.state.engine = None
 
     return client