Skip to content

Commit 20c4040

Browse files
committed
fixes test
1 parent 67e51fe commit 20c4040

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

services/web/server/src/simcore_service_webserver/projects/_trash_handlers.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,9 @@ async def trash_project(request: web.Request):
120120
user_id = get_user_id(request)
121121
product_name = get_product_name(request)
122122
path_params = parse_request_path_parameters_as(ProjectPathParams, request)
123-
query_params = parse_request_query_parameters_as(RemoveQueryParams, request)
123+
query_params: RemoveQueryParams = parse_request_query_parameters_as(
124+
RemoveQueryParams, request
125+
)
124126

125127
await _trash_api.trash_project(
126128
request.app,

services/web/server/tests/unit/with_dbs/03/test_project_db.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,30 +91,30 @@ def _assert_added_project(
9191
added_project: dict[str, Any],
9292
exp_overrides: dict[str, Any],
9393
):
94-
original_prj = deepcopy(exp_project)
94+
expected_prj = deepcopy(exp_project)
9595
added_prj = deepcopy(added_project)
96-
# no user so the project owner has a pre-defined value
9796
_DIFFERENT_KEYS = [
9897
"creationDate",
9998
"lastChangeDate",
10099
"accessRights", # NOTE: access rights were moved away from the projects table
101100
"trashedAt",
102101
]
103-
assert {k: v for k, v in original_prj.items() if k in _DIFFERENT_KEYS} != {
102+
assert {k: v for k, v in expected_prj.items() if k in _DIFFERENT_KEYS} != {
104103
k: v for k, v in added_prj.items() if k in _DIFFERENT_KEYS
105104
}
106105
assert to_datetime(added_prj["creationDate"]) > to_datetime(
107-
exp_project["creationDate"]
106+
expected_prj["creationDate"]
108107
)
109108
assert to_datetime(added_prj["creationDate"]) <= to_datetime(
110109
added_prj["lastChangeDate"]
111110
)
112-
original_prj.update(exp_overrides)
111+
expected_prj.update(exp_overrides)
113112
for k in _DIFFERENT_KEYS:
114-
added_prj.pop(k)
115-
original_prj.pop(k)
113+
added_prj.pop(k, None)
114+
expected_prj.pop(k, None)
115+
116116
# the rest of the keys shall be the same as the original
117-
assert added_prj == original_prj
117+
assert added_prj == expected_prj
118118

119119

120120
def _assert_projects_to_product_db_row(

0 commit comments

Comments
 (0)