Skip to content

Commit 416492e

Browse files
fix tests
1 parent c97eed0 commit 416492e

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

services/director-v2/tests/integration/02/test_dynamic_services_routes.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,11 @@ def minimal_configuration(
7777
simcore_services_ready: None,
7878
rabbit_service: RabbitSettings,
7979
storage_service: URL,
80-
):
81-
...
80+
): ...
8281

8382

8483
@pytest.fixture
85-
def mock_env(mock_env: EnvVarsDict, minimal_configuration) -> None:
86-
...
84+
def mock_env(mock_env: EnvVarsDict, minimal_configuration) -> None: ...
8785

8886

8987
@pytest.fixture
@@ -119,11 +117,13 @@ def start_request_data(
119117
service_resources: ServiceResourcesDict,
120118
ensure_swarm_and_networks: None,
121119
osparc_product_name: str,
120+
osparc_product_api_base_url: str,
122121
) -> dict[str, Any]:
123122
return {
124123
"user_id": user_id,
125124
"project_id": project_id,
126125
"product_name": osparc_product_name,
126+
"product_api_base_url": osparc_product_api_base_url,
127127
"service_uuid": node_uuid,
128128
"service_key": dy_static_file_server_dynamic_sidecar_service["image"]["name"],
129129
"service_version": dy_static_file_server_dynamic_sidecar_service["image"][

services/director-v2/tests/integration/02/test_mixed_dynamic_sidecar_and_legacy_project.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ def minimal_configuration(
112112
dy_static_file_server_dynamic_sidecar_compose_spec_service: dict,
113113
simcore_services_ready: None,
114114
ensure_swarm_and_networks: None,
115-
):
116-
...
115+
): ...
117116

118117

119118
@pytest.fixture
@@ -241,6 +240,7 @@ async def test_legacy_and_dynamic_sidecar_run(
241240
services_endpoint: dict[str, URL],
242241
async_client: httpx.AsyncClient,
243242
osparc_product_name: str,
243+
osparc_product_api_base_url: str,
244244
ensure_services_stopped: None,
245245
mock_projects_networks_repository: None,
246246
mock_sidecars_client: mock.Mock,
@@ -265,6 +265,7 @@ async def test_legacy_and_dynamic_sidecar_run(
265265
director_v2_client=async_client,
266266
# context
267267
product_name=osparc_product_name,
268+
product_api_base_url=osparc_product_api_base_url,
268269
user_id=user_dict["id"],
269270
project_id=str(dy_static_file_server_project.uuid),
270271
# service

services/director-v2/tests/integration/02/utils.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,7 @@ async def _handle_redirection(
328328
async def assert_start_service(
329329
director_v2_client: httpx.AsyncClient,
330330
product_name: str,
331+
product_api_base_url: str,
331332
user_id: UserID,
332333
project_id: str,
333334
service_key: str,
@@ -353,6 +354,7 @@ async def assert_start_service(
353354
service_resources
354355
),
355356
"product_name": product_name,
357+
"product_api_base_url": product_api_base_url,
356358
}
357359
headers = {
358360
X_DYNAMIC_SIDECAR_REQUEST_DNS: director_v2_client.base_url.host,

0 commit comments

Comments
 (0)