|
48 | 48 | from servicelib.aiohttp import status |
49 | 49 | from servicelib.common_headers import UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE |
50 | 50 | from settings_library.redis import RedisSettings |
51 | | -from simcore_postgres_database.models.projects import projects as projects_db_model |
52 | 51 | from simcore_postgres_database.models.projects_nodes import projects_nodes |
53 | 52 | from simcore_service_webserver.db.models import UserRole |
54 | 53 | from simcore_service_webserver.projects._controller.nodes_rest import ( |
@@ -462,19 +461,20 @@ def inc_running_services(self, *args, **kwargs): # noqa: ARG002 |
462 | 461 | # check that we do have NUM_DY_SERVICES nodes in the project |
463 | 462 | with postgres_db.connect() as conn: |
464 | 463 | 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"] |
467 | 466 | ) |
468 | 467 | ) |
469 | 468 | 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 |
472 | 471 | print(f"--> {NUM_DY_SERVICES} nodes were created concurrently") |
473 | 472 | # |
474 | 473 | # delete now |
475 | 474 | # |
476 | 475 | delete_node_tasks = [] |
477 | | - for node_id in workbench: |
| 476 | + |
| 477 | + for node_id in node_ids: |
478 | 478 | delete_url = client.app.router["delete_node"].url_for( |
479 | 479 | project_id=user_project["uuid"], node_id=node_id |
480 | 480 | ) |
@@ -595,13 +595,13 @@ async def inc_running_services(self, *args, **kwargs): # noqa: ARG002 |
595 | 595 | # check that we do have NUM_DY_SERVICES nodes in the project |
596 | 596 | with postgres_db.connect() as conn: |
597 | 597 | 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"] |
600 | 600 | ) |
601 | 601 | ) |
602 | 602 | 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 |
605 | 605 |
|
606 | 606 |
|
607 | 607 | @pytest.mark.parametrize(*standard_user_role()) |
|
0 commit comments