Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / python / tools / test_check_database.py

diff --git a/test/python/tools/test_check_database.py b/test/python/tools/test_check_database.py
index edba32364c32d33b230dc969b118a1abd6412bd3..886bd75b72842216d7e1173e2cf57f53cac6c400 100644 (file)
--- a/test/python/tools/test_check_database.py
+++ b/test/python/tools/test_check_database.py
@@ -1,9 +1,16 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# This file is part of Nominatim. (https://nominatim.org)
+#
+# Copyright (C) 2024 by the Nominatim developer community.
+# For a full list of authors see the git log.

 """
 Tests for database integrity checks.
 """
 import pytest
 
 """
 Tests for database integrity checks.
 """
 import pytest
 

-from nominatim.tools import check_database as chkdb
+from nominatim_db.tools import check_database as chkdb
+import nominatim_db.version

 
 def test_check_database_unknown_db(def_config, monkeypatch):
     monkeypatch.setenv('NOMINATIM_DATABASE_DSN', 'pgsql:dbname=fjgkhughwgh2423gsags')
 
 def test_check_database_unknown_db(def_config, monkeypatch):
     monkeypatch.setenv('NOMINATIM_DATABASE_DSN', 'pgsql:dbname=fjgkhughwgh2423gsags')


@@ -14,15 +21,25 @@ def test_check_database_fatal_test(def_config, temp_db):
     assert chkdb.check_database(def_config) == 1
 
 
     assert chkdb.check_database(def_config) == 1
 
 

-def test_check_conection_good(temp_db_conn, def_config):
+def test_check_connection_good(temp_db_conn, def_config):

     assert chkdb.check_connection(temp_db_conn, def_config) == chkdb.CheckState.OK
 
 
     assert chkdb.check_connection(temp_db_conn, def_config) == chkdb.CheckState.OK
 
 

-def test_check_conection_bad(def_config):
+def test_check_connection_bad(def_config):

     badconn = chkdb._BadConnection('Error')
     assert chkdb.check_connection(badconn, def_config) == chkdb.CheckState.FATAL
 
 
     badconn = chkdb._BadConnection('Error')
     assert chkdb.check_connection(badconn, def_config) == chkdb.CheckState.FATAL
 
 

+def test_check_database_version_good(property_table, temp_db_conn, def_config):
+    property_table.set('database_version',
+                       str(nominatim_db.version.NOMINATIM_VERSION))
+    assert chkdb.check_database_version(temp_db_conn, def_config) == chkdb.CheckState.OK
+
+def test_check_database_version_bad(property_table, temp_db_conn, def_config):
+    property_table.set('database_version', '3.9.9-9')
+    assert chkdb.check_database_version(temp_db_conn, def_config) == chkdb.CheckState.FATAL
+
+

 def test_check_placex_table_good(table_factory, temp_db_conn, def_config):
     table_factory('placex')
     assert chkdb.check_placex_table(temp_db_conn, def_config) == chkdb.CheckState.OK
 def test_check_placex_table_good(table_factory, temp_db_conn, def_config):
     table_factory('placex')
     assert chkdb.check_placex_table(temp_db_conn, def_config) == chkdb.CheckState.OK


@@ -70,7 +87,7 @@ def test_check_indexing_good(table_factory, temp_db_conn, def_config):
 def test_check_indexing_bad(table_factory, temp_db_conn, def_config):
     table_factory('placex', 'place_id int, indexed_status smallint',
                   content=((1, 0), (2, 2)))
 def test_check_indexing_bad(table_factory, temp_db_conn, def_config):
     table_factory('placex', 'place_id int, indexed_status smallint',
                   content=((1, 0), (2, 2)))

-    assert chkdb.check_indexing(temp_db_conn, def_config) == chkdb.CheckState.FAIL
+    assert chkdb.check_indexing(temp_db_conn, def_config) == chkdb.CheckState.WARN

 
 
 def test_check_database_indexes_bad(temp_db_conn, def_config):
 
 
 def test_check_database_indexes_bad(temp_db_conn, def_config):