reduce from 3 to 2 packages

[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 65f0590320ad09a309b91ff7f693ddae1b2cebe5..886bd75b72842216d7e1173e2cf57f53cac6c400 100644 (file)
--- a/test/python/tools/test_check_database.py
+++ b/test/python/tools/test_check_database.py
@@ -1,16 +1,16 @@
-# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-License-Identifier: GPL-3.0-or-later

 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #

-# Copyright (C) 2022 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 database integrity checks.
 """
 import pytest
 
 # For a full list of authors see the git log.
 """
 Tests for database integrity checks.
 """
 import pytest
 

-from nominatim.tools import check_database as chkdb
-import nominatim.version
+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')


@@ -32,7 +32,7 @@ def test_check_connection_bad(def_config):
 
 def test_check_database_version_good(property_table, temp_db_conn, def_config):
     property_table.set('database_version',
 
 def test_check_database_version_good(property_table, temp_db_conn, def_config):
     property_table.set('database_version',

-                       '{0[0]}.{0[1]}.{0[2]}-{0[3]}'.format(nominatim.version.NOMINATIM_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):
     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):