X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c314a3092c5b51c7782015f6fa9ac093b46fa174..c70dfccacac90a90bfc193f49262abe7505d7d75:/test/python/cli/test_cmd_import.py?ds=inline diff --git a/test/python/cli/test_cmd_import.py b/test/python/cli/test_cmd_import.py index 85235e1e..e4a86fe0 100644 --- a/test/python/cli/test_cmd_import.py +++ b/test/python/cli/test_cmd_import.py @@ -2,7 +2,7 @@ # # This file is part of Nominatim. (https://nominatim.org) # -# Copyright (C) 2024 by the Nominatim developer community. +# Copyright (C) 2025 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. @@ -24,17 +24,15 @@ class TestCliImportWithDb: self.call_nominatim = cli_call self.tokenizer_mock = cli_tokenizer_mock - def test_import_missing_file(self): assert self.call_nominatim('import', '--osm-file', 'sfsafegwedgw.reh.erh') == 1 - def test_import_bad_file(self): assert self.call_nominatim('import', '--osm-file', '.') == 1 - @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'), @@ -42,16 +40,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.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_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.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__] @@ -62,7 +59,6 @@ class TestCliImportWithDb: cf_mock = mock_func_factory(nominatim_db.tools.refresh, 'create_functions') - assert self.call_nominatim(*params) == 0 assert self.tokenizer_mock.finalize_import_called @@ -71,16 +67,14 @@ class TestCliImportWithDb: for mock in mocks: 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'), - 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.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') ] @@ -90,14 +84,12 @@ class TestCliImportWithDb: for mock in mocks: 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 = [ - 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.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') ] @@ -109,12 +101,10 @@ class TestCliImportWithDb: # Calling it again still works for the index 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 = [ - 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, 'setup_website'), mock_func_factory(nominatim_db.db.properties, 'set_property') ]