Skip to content

Commit 0cecabd

Browse files
fix tests
1 parent 5e14001 commit 0cecabd

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

services/web/server/tests/unit/with_dbs/02/test_projects_nodes_handler.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
from servicelib.aiohttp import status
4949
from servicelib.common_headers import UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE
5050
from settings_library.redis import RedisSettings
51-
from simcore_postgres_database.models.projects import projects as projects_db_model
5251
from simcore_postgres_database.models.projects_nodes import projects_nodes
5352
from simcore_service_webserver.db.models import UserRole
5453
from simcore_service_webserver.projects._controller.nodes_rest import (
@@ -462,19 +461,20 @@ def inc_running_services(self, *args, **kwargs): # noqa: ARG002
462461
# check that we do have NUM_DY_SERVICES nodes in the project
463462
with postgres_db.connect() as conn:
464463
result = conn.execute(
465-
sa.select(projects_db_model.c.workbench).where(
466-
projects_db_model.c.uuid == user_project["uuid"]
464+
sa.select(projects_nodes.c.node_id).where(
465+
projects_nodes.c.project_uuid == user_project["uuid"]
467466
)
468467
)
469468
assert result
470-
workbench = result.one()[projects_db_model.c.workbench]
471-
assert len(workbench) == NUM_DY_SERVICES + num_services_in_project
469+
node_ids = result.scalars().all()
470+
assert len(node_ids) == NUM_DY_SERVICES + num_services_in_project
472471
print(f"--> {NUM_DY_SERVICES} nodes were created concurrently")
473472
#
474473
# delete now
475474
#
476475
delete_node_tasks = []
477-
for node_id in workbench:
476+
477+
for node_id in node_ids:
478478
delete_url = client.app.router["delete_node"].url_for(
479479
project_id=user_project["uuid"], node_id=node_id
480480
)
@@ -595,13 +595,13 @@ async def inc_running_services(self, *args, **kwargs): # noqa: ARG002
595595
# check that we do have NUM_DY_SERVICES nodes in the project
596596
with postgres_db.connect() as conn:
597597
result = conn.execute(
598-
sa.select(projects_db_model.c.workbench).where(
599-
projects_db_model.c.uuid == project["uuid"]
598+
sa.select(projects_nodes.c.node_id).where(
599+
projects_nodes.c.project_uuid == project["uuid"]
600600
)
601601
)
602602
assert result
603-
workbench = result.one()[projects_db_model.c.workbench]
604-
assert len(workbench) == NUM_DY_SERVICES
603+
node_ids = result.scalars().all()
604+
assert len(node_ids) == NUM_DY_SERVICES
605605

606606

607607
@pytest.mark.parametrize(*standard_user_role())

0 commit comments

Comments
 (0)