make status API work with sqlite incl. unit tests

diff --git a/nominatim/api/status.py b/nominatim/api/status.py
index 61e36cc36488c097f58dd77d604b3975879500b4..adccf7a55409ef240f040c83a87c2f112f73af1a 100644 (file)
--- 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)
 
     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')
     # 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 036a235c9a0181d4b2a92fa853fb9215d9eff9d3..2acde2ecb49ee23f3f2c1722112f7dd1e43d0224 100644 (file)
--- 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
 
 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'
 
     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
 
 
     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'}])
 
     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'
 
     assert result.status == 0
     assert result.message == 'OK'