Skip to content

Commit ed7a2f0

Browse files
committed
fixing tests
1 parent b40ae44 commit ed7a2f0

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

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

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
# pylint: disable=unused-variable
44

55
from collections.abc import Callable
6+
from typing import Any
67

78
import simcore_service_catalog.service.access_rights
89
from fastapi import FastAPI
910
from models_library.groups import GroupID
1011
from models_library.products import ProductName
1112
from models_library.services import ServiceMetaDataPublished, ServiceVersion
13+
from models_library.services_authoring import Author
1214
from pydantic import TypeAdapter
1315
from pytest_mock import MockerFixture
1416
from pytest_simcore.helpers.catalog_services import CreateFakeServiceDataCallable
@@ -86,6 +88,7 @@ def test_reduce_access_rights():
8688

8789
async def test_auto_upgrade_policy(
8890
sqlalchemy_async_engine: AsyncEngine,
91+
user: dict[str, Any],
8992
user_groups_ids: list[GroupID],
9093
target_product: ProductName,
9194
other_product: ProductName,
@@ -101,25 +104,16 @@ async def test_auto_upgrade_policy(
101104
"_is_old_service",
102105
return_value=False,
103106
)
104-
# Avoids creating a users + user_to_group table
105-
# data = GroupAtDB.model_json_schema()["example"]
106-
# data["gid"] = everyone_gid
107-
# mocker.patch.object(
108-
# simcore_service_catalog.service.access_rights.GroupsRepository,
109-
# "get_everyone_group",
110-
# return_value=GroupAtDB.model_validate(data),
111-
# )
112-
# mocker.patch.object(
113-
# simcore_service_catalog.service.access_rights.GroupsRepository,
114-
# "get_user_gid_from_email",
115-
# return_value=user_gid,
116-
# )
117107

118108
# SETUP ---
119109
MOST_UPDATED_EXAMPLE = -1
120110
new_service_metadata = ServiceMetaDataPublished.model_validate(
121111
ServiceMetaDataPublished.model_json_schema()["examples"][MOST_UPDATED_EXAMPLE]
122112
)
113+
new_service_metadata.contact = user["email"]
114+
new_service_metadata.authors = [
115+
Author(name=user["name"], email=user["email"], affiliation=None)
116+
]
123117
new_service_metadata.version = TypeAdapter(ServiceVersion).validate_python("1.0.11")
124118
new_service_metadata.icon = None # Remove icon to test inheritance
125119

@@ -133,6 +127,7 @@ async def test_auto_upgrade_policy(
133127
product=target_product,
134128
)
135129
)
130+
136131
latest_release_service["icon"] = "https://foo/previous_icon.svg"
137132
latest_release = (latest_release_service, *latest_release_service_access_rights)
138133

0 commit comments

Comments
 (0)