Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / python / result_formatter / test_v1.py

diff --git a/test/python/result_formatter/test_v1.py b/test/python/result_formatter/test_v1.py
index da944c251b0e9c7b522e5d67406a4325d6fab6ac..919f5b8091e988956f782d1d9ff8d6b7d06778a3 100644 (file)
--- a/test/python/result_formatter/test_v1.py
+++ b/test/python/result_formatter/test_v1.py
@@ -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'}
 
@@ -38,7 +38,11 @@ class TestStatusResultFormat:
 
 
     def test_format_text(self):
-        assert self.formatter.format(StatusResult(0, 'message here'), 'text') == 'message here'
+        assert self.formatter.format(StatusResult(0, 'message here'), 'text') == 'OK'
+
+
+    def test_format_text(self):
+        assert self.formatter.format(StatusResult(500, 'message here'), 'text') == 'ERROR: message here'
 
 
     def test_format_json_minimal(self):
@@ -46,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):
@@ -56,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, )