fix merge issues

[nominatim.git] / test / python / cli / test_cmd_import.py

diff --git a/test/python/cli/test_cmd_import.py b/test/python/cli/test_cmd_import.py
index 17c6697dbeaa3ef28772d022ffa20403e5729f00..9c2400c5c2e65e561f816719292a6d712ff4cfd9 100644 (file)
--- a/test/python/cli/test_cmd_import.py
+++ b/test/python/cli/test_cmd_import.py
@@ -1,20 +1,20 @@
-# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 # 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 import command of the command-line interface wrapper.
 """
 import pytest
 
-import nominatim.tools.database_import
-import nominatim.data.country_info
-import nominatim.tools.refresh
-import nominatim.tools.postcodes
-import nominatim.indexer.indexer
-import nominatim.db.properties
+import nominatim_db.tools.database_import
+import nominatim_db.data.country_info
+import nominatim_db.tools.refresh
+import nominatim_db.tools.postcodes
+import nominatim_db.indexer.indexer
+import nominatim_core.db.properties
 
 
 class TestCliImportWithDb:
@@ -36,31 +36,31 @@ class TestCliImportWithDb:
     @pytest.mark.parametrize('with_updates', [True, False])
     def test_import_full(self, mock_func_factory, with_updates, place_table, property_table):
         mocks = [
-            mock_func_factory(nominatim.tools.database_import, 'setup_database_skeleton'),
-            mock_func_factory(nominatim.data.country_info, 'setup_country_tables'),
-            mock_func_factory(nominatim.tools.database_import, 'import_osm_data'),
-            mock_func_factory(nominatim.tools.refresh, 'import_wikipedia_articles'),
-            mock_func_factory(nominatim.tools.refresh, 'import_osm_views_geotiff'),
-            mock_func_factory(nominatim.tools.database_import, 'truncate_data_tables'),
-            mock_func_factory(nominatim.tools.database_import, 'load_data'),
-            mock_func_factory(nominatim.tools.database_import, 'create_tables'),
-            mock_func_factory(nominatim.tools.database_import, 'create_table_triggers'),
-            mock_func_factory(nominatim.tools.database_import, 'create_partition_tables'),
-            mock_func_factory(nominatim.tools.database_import, 'create_search_indices'),
-            mock_func_factory(nominatim.data.country_info, 'create_country_names'),
-            mock_func_factory(nominatim.tools.refresh, 'load_address_levels_from_config'),
-            mock_func_factory(nominatim.tools.postcodes, 'update_postcodes'),
-            mock_func_factory(nominatim.indexer.indexer.Indexer, 'index_full'),
-            mock_func_factory(nominatim.tools.refresh, 'setup_website'),
+            mock_func_factory(nominatim_db.tools.database_import, 'setup_database_skeleton'),
+            mock_func_factory(nominatim_db.data.country_info, 'setup_country_tables'),
+            mock_func_factory(nominatim_db.tools.database_import, 'import_osm_data'),
+            mock_func_factory(nominatim_db.tools.refresh, 'import_wikipedia_articles'),
+            mock_func_factory(nominatim_db.tools.refresh, 'import_secondary_importance'),
+            mock_func_factory(nominatim_db.tools.database_import, 'truncate_data_tables'),
+            mock_func_factory(nominatim_db.tools.database_import, 'load_data'),
+            mock_func_factory(nominatim_db.tools.database_import, 'create_tables'),
+            mock_func_factory(nominatim_db.tools.database_import, 'create_table_triggers'),
+            mock_func_factory(nominatim_db.tools.database_import, 'create_partition_tables'),
+            mock_func_factory(nominatim_db.tools.database_import, 'create_search_indices'),
+            mock_func_factory(nominatim_db.data.country_info, 'create_country_names'),
+            mock_func_factory(nominatim_db.tools.refresh, 'load_address_levels_from_config'),
+            mock_func_factory(nominatim_db.tools.postcodes, 'update_postcodes'),
+            mock_func_factory(nominatim_db.indexer.indexer.Indexer, 'index_full'),
+            mock_func_factory(nominatim_db.tools.refresh, 'setup_website'),
         ]
 
         params = ['import', '--osm-file', __file__]
 
         if with_updates:
-            mocks.append(mock_func_factory(nominatim.tools.freeze, 'drop_update_tables'))
+            mocks.append(mock_func_factory(nominatim_db.tools.freeze, 'drop_update_tables'))
             params.append('--no-updates')
 
-        cf_mock = mock_func_factory(nominatim.tools.refresh, 'create_functions')
+        cf_mock = mock_func_factory(nominatim_db.tools.refresh, 'create_functions')
 
 
         assert self.call_nominatim(*params) == 0
@@ -69,19 +69,19 @@ class TestCliImportWithDb:
         assert cf_mock.called > 1
 
         for mock in mocks:
-            assert mock.called > 0, "Mock '{}' not called".format(mock.func_name)
+            assert mock.called == 1, "Mock '{}' not called".format(mock.func_name)
 
 
     def test_import_continue_load_data(self, mock_func_factory):
         mocks = [
-            mock_func_factory(nominatim.tools.database_import, 'truncate_data_tables'),
-            mock_func_factory(nominatim.tools.database_import, 'load_data'),
-            mock_func_factory(nominatim.tools.database_import, 'create_search_indices'),
-            mock_func_factory(nominatim.data.country_info, 'create_country_names'),
-            mock_func_factory(nominatim.tools.postcodes, 'update_postcodes'),
-            mock_func_factory(nominatim.indexer.indexer.Indexer, 'index_full'),
-            mock_func_factory(nominatim.tools.refresh, 'setup_website'),
-            mock_func_factory(nominatim.db.properties, 'set_property')
+            mock_func_factory(nominatim_db.tools.database_import, 'truncate_data_tables'),
+            mock_func_factory(nominatim_db.tools.database_import, 'load_data'),
+            mock_func_factory(nominatim_db.tools.database_import, 'create_search_indices'),
+            mock_func_factory(nominatim_db.data.country_info, 'create_country_names'),
+            mock_func_factory(nominatim_db.tools.postcodes, 'update_postcodes'),
+            mock_func_factory(nominatim_db.indexer.indexer.Indexer, 'index_full'),
+            mock_func_factory(nominatim_db.tools.refresh, 'setup_website'),
+            mock_func_factory(nominatim_core.db.properties, 'set_property')
         ]
 
         assert self.call_nominatim('import', '--continue', 'load-data') == 0
@@ -94,11 +94,11 @@ class TestCliImportWithDb:
     def test_import_continue_indexing(self, mock_func_factory, placex_table,
                                       temp_db_conn):
         mocks = [
-            mock_func_factory(nominatim.tools.database_import, 'create_search_indices'),
-            mock_func_factory(nominatim.data.country_info, 'create_country_names'),
-            mock_func_factory(nominatim.indexer.indexer.Indexer, 'index_full'),
-            mock_func_factory(nominatim.tools.refresh, 'setup_website'),
-            mock_func_factory(nominatim.db.properties, 'set_property')
+            mock_func_factory(nominatim_db.tools.database_import, 'create_search_indices'),
+            mock_func_factory(nominatim_db.data.country_info, 'create_country_names'),
+            mock_func_factory(nominatim_db.indexer.indexer.Indexer, 'index_full'),
+            mock_func_factory(nominatim_db.tools.refresh, 'setup_website'),
+            mock_func_factory(nominatim_core.db.properties, 'set_property')
         ]
 
         assert self.call_nominatim('import', '--continue', 'indexing') == 0
@@ -112,10 +112,10 @@ class TestCliImportWithDb:
 
     def test_import_continue_postprocess(self, mock_func_factory):
         mocks = [
-            mock_func_factory(nominatim.tools.database_import, 'create_search_indices'),
-            mock_func_factory(nominatim.data.country_info, 'create_country_names'),
-            mock_func_factory(nominatim.tools.refresh, 'setup_website'),
-            mock_func_factory(nominatim.db.properties, 'set_property')
+            mock_func_factory(nominatim_db.tools.database_import, 'create_search_indices'),
+            mock_func_factory(nominatim_db.data.country_info, 'create_country_names'),
+            mock_func_factory(nominatim_db.tools.refresh, 'setup_website'),
+            mock_func_factory(nominatim_core.db.properties, 'set_property')
         ]
 
         assert self.call_nominatim('import', '--continue', 'db-postprocess') == 0