From 06bbd501fd1b7b0063de000ca823bb44ba1f449f Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Thu, 12 Oct 2023 16:17:16 +0200 Subject: [PATCH] make status API work with sqlite incl. unit tests --- nominatim/api/status.py | 3 +++ test/python/api/test_api_status.py | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/nominatim/api/status.py b/nominatim/api/status.py index 61e36cc3..adccf7a5 100644 --- a/nominatim/api/status.py +++ b/nominatim/api/status.py @@ -36,6 +36,9 @@ async def get_status(conn: SearchConnection) -> StatusResult: sql = sa.select(conn.t.import_status.c.lastimportdate).limit(1) status.data_updated = await conn.scalar(sql) + if status.data_updated is not None: + status.data_updated = status.data_updated.replace(tzinfo=dt.timezone.utc) + # Database version try: verstr = await conn.get_property('database_version') diff --git a/test/python/api/test_api_status.py b/test/python/api/test_api_status.py index 036a235c..2acde2ec 100644 --- a/test/python/api/test_api_status.py +++ b/test/python/api/test_api_status.py @@ -14,8 +14,9 @@ import pytest from nominatim.version import NOMINATIM_VERSION, NominatimVersion import nominatim.api as napi -def test_status_no_extra_info(apiobj): - result = apiobj.api.status() +def test_status_no_extra_info(apiobj, frontend): + api = frontend(apiobj) + result = api.status() assert result.status == 0 assert result.message == 'OK' @@ -24,14 +25,15 @@ def test_status_no_extra_info(apiobj): assert result.data_updated is None -def test_status_full(apiobj): +def test_status_full(apiobj, frontend): import_date = dt.datetime(2022, 12, 7, 14, 14, 46, 0, tzinfo=dt.timezone.utc) apiobj.add_data('import_status', [{'lastimportdate': import_date}]) apiobj.add_data('properties', [{'property': 'database_version', 'value': '99.5.4-2'}]) - result = apiobj.api.status() + api = frontend(apiobj) + result = api.status() assert result.status == 0 assert result.message == 'OK' -- 2.39.5