Merge remote-tracking branch 'upstream/master'

[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 85235e1e2e1e123ed132d7a3c81a6f211fe20706..f833dde347d7b743fbda477b1a2b761b59c6ebf2 100644 (file)
--- a/test/python/cli/test_cmd_import.py
+++ b/test/python/cli/test_cmd_import.py
@@ -34,7 +34,8 @@ class TestCliImportWithDb:
 
 
     @pytest.mark.parametrize('with_updates', [True, False])
 
 
     @pytest.mark.parametrize('with_updates', [True, False])

-    def test_import_full(self, mock_func_factory, with_updates, place_table, property_table):
+    def test_import_full(self, mock_func_factory, async_mock_func_factory,
+                         with_updates, place_table, property_table):

         mocks = [
             mock_func_factory(nominatim_db.tools.database_import, 'setup_database_skeleton'),
             mock_func_factory(nominatim_db.data.country_info, 'setup_country_tables'),
         mocks = [
             mock_func_factory(nominatim_db.tools.database_import, 'setup_database_skeleton'),
             mock_func_factory(nominatim_db.data.country_info, 'setup_country_tables'),


@@ -42,16 +43,15 @@ class TestCliImportWithDb:
             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.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'),
+            async_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_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'),
+            async_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.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'),
+            async_mock_func_factory(nominatim_db.indexer.indexer.Indexer, 'index_full'),

         ]
 
         params = ['import', '--osm-file', __file__]
         ]
 
         params = ['import', '--osm-file', __file__]


@@ -72,15 +72,14 @@ class TestCliImportWithDb:
             assert mock.called == 1, "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):
+    def test_import_continue_load_data(self, mock_func_factory, async_mock_func_factory):

         mocks = [
             mock_func_factory(nominatim_db.tools.database_import, 'truncate_data_tables'),
         mocks = [
             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'),
+            async_mock_func_factory(nominatim_db.tools.database_import, 'load_data'),
+            async_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.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'),
+            async_mock_func_factory(nominatim_db.indexer.indexer.Indexer, 'index_full'),

             mock_func_factory(nominatim_db.db.properties, 'set_property')
         ]
 
             mock_func_factory(nominatim_db.db.properties, 'set_property')
         ]
 


@@ -91,13 +90,12 @@ class TestCliImportWithDb:
             assert mock.called == 1, "Mock '{}' not called".format(mock.func_name)
 
 
             assert mock.called == 1, "Mock '{}' not called".format(mock.func_name)
 
 

-    def test_import_continue_indexing(self, mock_func_factory, placex_table,
-                                      temp_db_conn):
+    def test_import_continue_indexing(self, mock_func_factory, async_mock_func_factory,
+                                      placex_table, temp_db_conn):

         mocks = [
         mocks = [

-            mock_func_factory(nominatim_db.tools.database_import, 'create_search_indices'),
+            async_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.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'),
+            async_mock_func_factory(nominatim_db.indexer.indexer.Indexer, 'index_full'),

             mock_func_factory(nominatim_db.db.properties, 'set_property')
         ]
 
             mock_func_factory(nominatim_db.db.properties, 'set_property')
         ]
 


@@ -110,11 +108,10 @@ class TestCliImportWithDb:
         assert self.call_nominatim('import', '--continue', 'indexing') == 0
 
 
         assert self.call_nominatim('import', '--continue', 'indexing') == 0
 
 

-    def test_import_continue_postprocess(self, mock_func_factory):
+    def test_import_continue_postprocess(self, mock_func_factory, async_mock_func_factory):

         mocks = [
         mocks = [

-            mock_func_factory(nominatim_db.tools.database_import, 'create_search_indices'),
+            async_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.data.country_info, 'create_country_names'),

-            mock_func_factory(nominatim_db.tools.refresh, 'setup_website'),

             mock_func_factory(nominatim_db.db.properties, 'set_property')
         ]
 
             mock_func_factory(nominatim_db.db.properties, 'set_property')
         ]