X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/bc75e5626ec59523707b842022ecf0bdc159cf06..c70dfccacac90a90bfc193f49262abe7505d7d75:/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 e47d713c..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,15 +24,12 @@ 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, async_mock_func_factory, with_updates, place_table, property_table): @@ -52,7 +49,6 @@ class TestCliImportWithDb: mock_func_factory(nominatim_db.tools.refresh, 'load_address_levels_from_config'), mock_func_factory(nominatim_db.tools.postcodes, 'update_postcodes'), async_mock_func_factory(nominatim_db.indexer.indexer.Indexer, 'index_full'), - mock_func_factory(nominatim_db.tools.refresh, 'setup_website'), ] params = ['import', '--osm-file', __file__] @@ -63,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 @@ -72,7 +67,6 @@ 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, async_mock_func_factory): mocks = [ mock_func_factory(nominatim_db.tools.database_import, 'truncate_data_tables'), @@ -81,7 +75,6 @@ class TestCliImportWithDb: mock_func_factory(nominatim_db.data.country_info, 'create_country_names'), mock_func_factory(nominatim_db.tools.postcodes, 'update_postcodes'), async_mock_func_factory(nominatim_db.indexer.indexer.Indexer, 'index_full'), - mock_func_factory(nominatim_db.tools.refresh, 'setup_website'), mock_func_factory(nominatim_db.db.properties, 'set_property') ] @@ -91,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, async_mock_func_factory, placex_table, temp_db_conn): mocks = [ async_mock_func_factory(nominatim_db.tools.database_import, 'create_search_indices'), mock_func_factory(nominatim_db.data.country_info, 'create_country_names'), async_mock_func_factory(nominatim_db.indexer.indexer.Indexer, 'index_full'), - mock_func_factory(nominatim_db.tools.refresh, 'setup_website'), mock_func_factory(nominatim_db.db.properties, 'set_property') ] @@ -110,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, async_mock_func_factory): mocks = [ 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') ]