Skip to content

Commit f875504

Browse files
committed
✨ Refactor test service access rights: update mock patching and improve schema access
1 parent d0452cd commit f875504

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

services/catalog/tests/unit/with_dbs/test_service_access_rights.py

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
from collections.abc import Callable
66

7+
import simcore_service_catalog.service.access_rights
78
from fastapi import FastAPI
89
from models_library.groups import GroupAtDB
910
from models_library.products import ProductName
@@ -93,28 +94,29 @@ async def test_auto_upgrade_policy(
9394
everyone_gid, user_gid, team_gid = user_groups_ids
9495

9596
# Avoids calls to director API
96-
mocker.patch(
97-
"simcore_service_catalog.services.access_rights._is_old_service",
97+
mocker.patch.object(
98+
simcore_service_catalog.service.access_rights,
99+
"_is_old_service",
98100
return_value=False,
99101
)
100102
# Avoids creating a users + user_to_group table
101-
data = GroupAtDB.model_config["json_schema_extra"]["example"]
103+
data = GroupAtDB.model_json_schema()["example"]
102104
data["gid"] = everyone_gid
103-
mocker.patch(
104-
"simcore_service_catalog.services.access_rights.GroupsRepository.get_everyone_group",
105+
mocker.patch.object(
106+
simcore_service_catalog.service.access_rights.GroupsRepository,
107+
"get_everyone_group",
105108
return_value=GroupAtDB.model_validate(data),
106109
)
107-
mocker.patch(
108-
"simcore_service_catalog.services.access_rights.GroupsRepository.get_user_gid_from_email",
110+
mocker.patch.object(
111+
simcore_service_catalog.service.access_rights.GroupsRepository,
112+
"get_user_gid_from_email",
109113
return_value=user_gid,
110114
)
111115

112116
# SETUP ---
113117
MOST_UPDATED_EXAMPLE = -1
114118
new_service_metadata = ServiceMetaDataPublished.model_validate(
115-
ServiceMetaDataPublished.model_config["json_schema_extra"]["examples"][
116-
MOST_UPDATED_EXAMPLE
117-
]
119+
ServiceMetaDataPublished.model_json_schema()["examples"][MOST_UPDATED_EXAMPLE]
118120
)
119121
new_service_metadata.version = TypeAdapter(ServiceVersion).validate_python("1.0.11")
120122

0 commit comments

Comments
 (0)