Skip to content

Commit 36716b3

Browse files
committed
adding stuff
1 parent 25f0218 commit 36716b3

File tree

1 file changed

+11
-42
lines changed

1 file changed

+11
-42
lines changed

services/web/server/tests/integration/01/notifications/test_rabbitmq_consumers.py

Lines changed: 11 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,20 @@
7070
from tenacity.wait import wait_fixed
7171

7272
pytest_simcore_core_services_selection = [
73+
"catalog",
74+
"director-v2",
75+
"director",
76+
"migration",
7377
"postgres",
7478
"rabbit",
7579
"redis",
80+
"storage",
7681
]
7782

78-
pytest_simcore_ops_services_selection = ["redis-commander"]
83+
pytest_simcore_ops_services_selection = [
84+
"minio",
85+
"redis-commander",
86+
]
7987

8088
_STABLE_DELAY_S = 2
8189

@@ -132,13 +140,15 @@ async def _assert_handler_called_with_json(
132140

133141
@pytest.fixture
134142
async def client(
143+
docker_registry: str,
135144
mock_redis_socket_timeout: None,
136145
aiohttp_client: Callable,
137146
app_config: dict[str, Any],
138147
rabbit_service: RabbitSettings,
139148
postgres_db: sa.engine.Engine,
140149
redis_client: Redis,
141150
monkeypatch_setenv_from_app_config: Callable,
151+
simcore_services_ready: None,
142152
) -> TestClient:
143153
app_config["storage"]["enabled"] = False
144154

@@ -370,45 +380,6 @@ async def test_progress_non_computational_workflow(
370380
await _assert_handler_not_called(mock_progress_handler)
371381

372382

373-
@pytest.fixture
374-
def mock_dynamic_scheduler(mocker: MockerFixture) -> None:
375-
mocker.patch(
376-
"simcore_service_webserver.dynamic_scheduler.api.stop_dynamic_services_in_project",
377-
autospec=True,
378-
)
379-
mocker.patch(
380-
"simcore_service_webserver.dynamic_scheduler.api.update_projects_networks",
381-
autospec=True,
382-
)
383-
384-
385-
@pytest.fixture
386-
async def mocked_dynamic_services_interface(
387-
mocker: MockerFixture,
388-
) -> dict[str, mock.MagicMock]:
389-
mock = {}
390-
391-
for func_name in (
392-
"list_dynamic_services",
393-
"get_dynamic_service",
394-
"run_dynamic_service",
395-
"stop_dynamic_service",
396-
):
397-
name = f"dynamic_scheduler.api.{func_name}"
398-
mock[name] = mocker.patch(
399-
f"simcore_service_webserver.{name}",
400-
autospec=True,
401-
return_value={},
402-
)
403-
404-
mock["director_v2.api.create_or_update_pipeline"] = mocker.patch(
405-
"simcore_service_webserver.director_v2.director_v2_service.create_or_update_pipeline",
406-
autospec=True,
407-
return_value=None,
408-
)
409-
return mock
410-
411-
412383
@pytest.mark.parametrize("user_role", [UserRole.GUEST], ids=str)
413384
@pytest.mark.parametrize(
414385
"sender_same_user_id", [True, False], ids=lambda id_: f"same_sender_id={id_}"
@@ -417,8 +388,6 @@ async def mocked_dynamic_services_interface(
417388
"subscribe_to_logs", [True, False], ids=lambda id_: f"subscribed={id_}"
418389
)
419390
async def test_progress_computational_workflow(
420-
mock_dynamic_scheduler: None,
421-
mocked_dynamic_services_interface: dict[str, mock.MagicMock],
422391
client: TestClient,
423392
rabbitmq_publisher: RabbitMQClient,
424393
user_project: ProjectDict,

0 commit comments

Comments
 (0)