Skip to content

Commit 43ae5b0

Browse files
committed
fix tests
1 parent f5a7c40 commit 43ae5b0

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,9 @@ async def test_list_services_that_are_deprecated(
240240
):
241241

242242
# injects fake data in db
243-
deprecation_date = datetime.utcnow() + timedelta(days=1)
243+
deprecation_date = datetime.utcnow() + timedelta( # NOTE: old offset-naive column
244+
days=1
245+
)
244246
deprecated_service = create_fake_service_data(
245247
"simcore/services/dynamic/jupyterlab",
246248
"1.0.1",

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

+6-10
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
# pylint: disable=unused-variable
44

55
from collections.abc import Callable
6-
from datetime import timedelta
6+
from datetime import datetime, timedelta
77
from typing import Any
88

9-
import arrow
109
import pytest
1110
from fastapi import FastAPI
1211
from models_library.api_schemas_catalog.services import MyServiceGet
@@ -179,7 +178,9 @@ async def test_batch_get_my_services(
179178
other_service_key = "simcore/services/comp/other-service"
180179
other_service_version = "2.0.0"
181180

182-
expected_retirement = arrow.now().datetime + timedelta(days=1)
181+
expected_retirement = datetime.utcnow() + timedelta(
182+
days=1
183+
) # NOTE: old offset-naive column
183184

184185
fake_service_1 = create_fake_service_data(
185186
service_key,
@@ -224,19 +225,14 @@ async def test_batch_get_my_services(
224225
# assert returned order and length as ids
225226
assert services_ids == [(sc.key, sc.release.version) for sc in my_services]
226227

227-
assert my_services[1].release.retired is None
228-
assert my_services[2].release.compatibility is None # nothing to update
229-
230-
released = my_services[1].release
231-
232228
assert my_services == TypeAdapter(list[MyServiceGet]).validate_python(
233229
[
234230
{
235231
"key": "simcore/services/comp/some-service",
236232
"release": {
237233
"version": "1.0.0",
238234
"version_display": None,
239-
"released": released,
235+
"released": my_services[0].release.released,
240236
"retired": expected_retirement,
241237
"compatibility": {
242238
"can_update_to": {"version": "1.0.1"}
@@ -250,7 +246,7 @@ async def test_batch_get_my_services(
250246
"release": {
251247
"version": "2.0.0",
252248
"version_display": None,
253-
"released": released,
249+
"released": my_services[1].release.released,
254250
"retired": None,
255251
"compatibility": None, # cannot be updated
256252
},

0 commit comments

Comments
 (0)