X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/0c65289a80fb376b9d7e53653e16cef6a8fa781e..d22ca186e4d388c228e90e1e701452c041a34687:/test/python/api/test_api_status.py diff --git a/test/python/api/test_api_status.py b/test/python/api/test_api_status.py index 036a235c..5412ca6e 100644 --- a/test/python/api/test_api_status.py +++ b/test/python/api/test_api_status.py @@ -1,8 +1,8 @@ -# SPDX-License-Identifier: GPL-2.0-only +# SPDX-License-Identifier: GPL-3.0-or-later # # This file is part of Nominatim. (https://nominatim.org) # -# Copyright (C) 2023 by the Nominatim developer community. +# Copyright (C) 2024 by the Nominatim developer community. # For a full list of authors see the git log. """ Tests for the status API call. @@ -11,32 +11,35 @@ from pathlib import Path import datetime as dt import pytest -from nominatim.version import NOMINATIM_VERSION, NominatimVersion -import nominatim.api as napi +from nominatim_db.version import NominatimVersion +from nominatim_api.version import NOMINATIM_API_VERSION +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.software_version == NOMINATIM_VERSION + assert result.software_version == NOMINATIM_API_VERSION assert result.database_version 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'}]) - result = apiobj.api.status() + api = frontend(apiobj) + result = api.status() assert result.status == 0 assert result.message == 'OK' - assert result.software_version == NOMINATIM_VERSION - assert result.database_version == NominatimVersion(99, 5, 4, 2) + assert result.software_version == NOMINATIM_API_VERSION + assert result.database_version == '99.5.4-2' assert result.data_updated == import_date @@ -49,6 +52,6 @@ def test_status_database_not_found(monkeypatch): assert result.status == 700 assert result.message == 'Database connection failed' - assert result.software_version == NOMINATIM_VERSION + assert result.software_version == NOMINATIM_API_VERSION assert result.database_version is None assert result.data_updated is None