Skip to content

Commit 86aa7d7

Browse files
author
Andrei Neagu
committed
fixed unused
1 parent 0b94380 commit 86aa7d7

File tree

3 files changed

+1
-28
lines changed

3 files changed

+1
-28
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ async def get_service_labels(
117117
)
118118
resp.raise_for_status()
119119
if resp.status_code == status.HTTP_200_OK:
120-
return SimcoreServiceLabels.model_validate(resp)
120+
return SimcoreServiceLabels.model_validate(resp.json())
121121
raise HTTPException(status_code=resp.status_code, detail=resp.content)
122122

123123
async def get_service_specifications(

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import logging
77
import re
8-
import urllib.parse
98
from collections.abc import AsyncGenerator, Awaitable, Callable, Iterator
109
from contextlib import asynccontextmanager, contextmanager
1110
from typing import Final
@@ -18,14 +17,12 @@
1817
from models_library.api_schemas_directorv2.dynamic_services_service import (
1918
RunningDynamicServiceDetails,
2019
)
21-
from models_library.service_settings_labels import SimcoreServiceLabels
2220
from models_library.services_enums import ServiceState
2321
from models_library.wallets import WalletID
2422
from pydantic import NonNegativeFloat
2523
from pytest_mock.plugin import MockerFixture
2624
from pytest_simcore.helpers.typing_env import EnvVarsDict
2725
from respx.router import MockRouter
28-
from simcore_service_director_v2.core.settings import AppSettings
2926
from simcore_service_director_v2.models.dynamic_services_scheduler import (
3027
DockerContainerInspect,
3128
DynamicSidecarStatus,
@@ -149,24 +146,6 @@ def mock_env(
149146
monkeypatch.setenv("S3_BUCKET_NAME", faker.pystr())
150147

151148

152-
@pytest.fixture
153-
def mocked_director_v0(
154-
minimal_config: AppSettings, scheduler_data: SchedulerData
155-
) -> Iterator[MockRouter]:
156-
endpoint = minimal_config.DIRECTOR_V0.endpoint
157-
158-
with respx.mock as mock:
159-
mock.get(
160-
re.compile(
161-
rf"^{endpoint}/services/{urllib.parse.quote_plus(scheduler_data.key)}/{scheduler_data.version}/labels"
162-
),
163-
name="service labels",
164-
).respond(
165-
json={"data": SimcoreServiceLabels.model_json_schema()["examples"][0]}
166-
)
167-
yield mock
168-
169-
170149
@pytest.fixture
171150
def mocked_dynamic_scheduler_events(mocker: MockerFixture) -> None:
172151
class AlwaysTriggersDynamicSchedulerEvent(DynamicSchedulerEvent):

services/director-v2/tests/unit/with_dbs/test_api_route_dynamic_services.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -238,12 +238,6 @@ def mocked_director_v0_service_api(
238238
assert_all_called=False,
239239
assert_all_mocked=True,
240240
) as respx_mock:
241-
# get services labels
242-
respx_mock.get(
243-
f"/services/{urllib.parse.quote_plus(service['key'])}/{service['version']}/labels",
244-
name="service labels",
245-
).respond(json={"data": service_labels})
246-
247241
respx_mock.get(
248242
f"/running_interactive_services/{service['node_uuid']}",
249243
name="running interactive service",

0 commit comments

Comments
 (0)