Skip to content

Commit 12cc2d3

Browse files
committed
fixes tests
1 parent 87b2acf commit 12cc2d3

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

services/director-v2/tests/unit/with_dbs/comp_scheduler/test_api_route_computations.py

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def fake_service_details(mocks_dir: Path) -> ServiceMetaDataPublished:
110110

111111
@pytest.fixture
112112
def fake_service_extras() -> ServiceExtras:
113-
extra_example = ServiceExtras.model_config["json_schema_extra"]["examples"][2] # type: ignore
113+
extra_example = ServiceExtras.model_json_schema()["examples"][2] # type: ignore
114114
random_extras = ServiceExtras(**extra_example) # type: ignore
115115
assert random_extras is not None
116116
return random_extras
@@ -281,14 +281,14 @@ def _mocked_services_details(
281281

282282

283283
assert "json_schema_extra" in RutPricingPlanGet.model_config
284-
assert isinstance(RutPricingPlanGet.model_config["json_schema_extra"], dict)
285-
assert isinstance(RutPricingPlanGet.model_config["json_schema_extra"]["examples"], list)
284+
assert isinstance(RutPricingPlanGet.model_json_schema(), dict)
285+
assert isinstance(RutPricingPlanGet.model_json_schema()["examples"], list)
286286

287287

288288
@pytest.fixture(
289289
params=[
290-
RutPricingPlanGet.model_config["json_schema_extra"]["examples"][0],
291-
RutPricingPlanGet.model_config["json_schema_extra"]["examples"][1],
290+
RutPricingPlanGet.model_json_schema()["examples"][0],
291+
RutPricingPlanGet.model_json_schema()["examples"][1],
292292
],
293293
ids=["with ec2 restriction", "without"],
294294
)
@@ -329,19 +329,15 @@ def _mocked_service_default_pricing_plan(
329329

330330
def _mocked_get_pricing_unit(request, pricing_plan_id: int) -> httpx.Response:
331331
assert "json_schema_extra" in RutPricingUnitGet.model_config
332-
assert isinstance(RutPricingUnitGet.model_config["json_schema_extra"], dict)
333-
assert isinstance(
334-
RutPricingUnitGet.model_config["json_schema_extra"]["examples"], list
335-
)
332+
assert isinstance(RutPricingUnitGet.model_json_schema(), dict)
333+
assert isinstance(RutPricingUnitGet.model_json_schema()["examples"], list)
336334
return httpx.Response(
337335
200,
338336
json=jsonable_encoder(
339337
(
340338
default_pricing_plan.pricing_units[0]
341339
if default_pricing_plan.pricing_units
342-
else RutPricingUnitGet.model_config["json_schema_extra"][
343-
"examples"
344-
][0]
340+
else RutPricingUnitGet.model_json_schema()["examples"][0]
345341
),
346342
by_alias=True,
347343
),
@@ -596,7 +592,7 @@ async def test_create_computation_with_wallet(
596592
"default_pricing_plan",
597593
[
598594
RutPricingPlanGet.model_validate(
599-
RutPricingPlanGet.model_config["json_schema_extra"]["examples"][0]
595+
RutPricingPlanGet.model_json_schema()["examples"][0]
600596
)
601597
],
602598
)
@@ -638,7 +634,7 @@ async def test_create_computation_with_wallet_with_invalid_pricing_unit_name_rai
638634
"default_pricing_plan",
639635
[
640636
RutPricingPlanGet(
641-
**RutPricingPlanGet.model_config["json_schema_extra"]["examples"][0] # type: ignore
637+
**RutPricingPlanGet.model_json_schema()["examples"][0] # type: ignore
642638
)
643639
],
644640
)

0 commit comments

Comments
 (0)