hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

convert version to named tuple

Browse Source 
Also return the new NominatimVersion rather than a string in the
status result.
This commit is contained in:
Sarah Hoffmann
2022-12-13 10:36:19 +01:00
parent 93b9288c30
commit 0c47558729
11 changed files with 67 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/python/api/test_api_status.py
View File

@@ -11,7 +11,7 @@ from pathlib import Path
import datetime as dt
import pytest
from nominatim.version import version_str
from nominatim.version import NOMINATIM_VERSION, NominatimVersion
from nominatim.api import NominatimAPI
def test_status_no_extra_info(apiobj, table_factory):
@@ -24,7 +24,7 @@ def test_status_no_extra_info(apiobj, table_factory):
assert result.status == 0
assert result.message == 'OK'
assert result.software_version == version_str()
assert result.software_version == NOMINATIM_VERSION
assert result.database_version is None
assert result.data_updated is None
@@ -41,8 +41,8 @@ def test_status_full(apiobj, table_factory):
assert result.status == 0
assert result.message == 'OK'
assert result.software_version == version_str()
assert result.database_version == '99.5.4-2'
assert result.software_version == NOMINATIM_VERSION
assert result.database_version == NominatimVersion(99, 5, 4, 2)
assert result.data_updated == dt.datetime(2022, 12, 7, 14, 14, 46, 0, tzinfo=dt.timezone.utc)
@@ -55,6 +55,6 @@ def test_status_database_not_found(monkeypatch):
assert result.status == 700
assert result.message == 'Database connection failed'
assert result.software_version == version_str()
assert result.software_version == NOMINATIM_VERSION
assert result.database_version is None
assert result.data_updated is None

6
test/python/result_formatter/test_v1.py
View File

@@ -12,7 +12,7 @@ import pytest
import nominatim.result_formatter.v1 as format_module
from nominatim.apicmd.status import StatusResult
from nominatim.version import version_str
from nominatim.version import NOMINATIM_VERSION
STATUS_FORMATS = {'text', 'json'}
@@ -50,7 +50,7 @@ class TestStatusResultFormat:
result = self.formatter.format(status, 'json')
assert result == '{"status": 700, "message": "Bad format.", "software_version": "%s"}' % (version_str())
assert result == '{"status": 700, "message": "Bad format.", "software_version": "%s"}' % (NOMINATIM_VERSION, )
def test_format_json_full(self):
@@ -60,4 +60,4 @@ class TestStatusResultFormat:
result = self.formatter.format(status, 'json')
assert result == '{"status": 0, "message": "OK", "data_updated": "2010-02-07T20:20:03+00:00", "software_version": "%s", "database_version": "5.6"}' % (version_str())
assert result == '{"status": 0, "message": "OK", "data_updated": "2010-02-07T20:20:03+00:00", "software_version": "%s", "database_version": "5.6"}' % (NOMINATIM_VERSION, )