X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/0c023fb4d25c3c94c08197e3c733d11ceb0d9ba1..834ae0a93f2f25b3231f4c47612ac1d2c170738a:/test/python/test_cli.py?ds=inline diff --git a/test/python/test_cli.py b/test/python/test_cli.py index bd5182e3..c83ee3dd 100644 --- a/test/python/test_cli.py +++ b/test/python/test_cli.py @@ -18,6 +18,7 @@ import nominatim.tools.admin import nominatim.tools.add_osm_data import nominatim.tools.check_database import nominatim.tools.database_import +import nominatim.tools.country_info import nominatim.tools.freeze import nominatim.tools.refresh import nominatim.tools.postcodes @@ -170,6 +171,7 @@ class TestCliWithDb: def test_import_full(self, mock_func_factory): mocks = [ mock_func_factory(nominatim.tools.database_import, 'setup_database_skeleton'), + mock_func_factory(nominatim.tools.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.database_import, 'truncate_data_tables'), @@ -178,7 +180,7 @@ class TestCliWithDb: 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.tools.database_import, 'create_country_names'), + mock_func_factory(nominatim.tools.country_info, 'create_country_names'), mock_func_factory(nominatim.tools.refresh, 'load_address_levels_from_file'), mock_func_factory(nominatim.tools.postcodes, 'update_postcodes'), mock_func_factory(nominatim.indexer.indexer.Indexer, 'index_full'), @@ -202,7 +204,7 @@ class TestCliWithDb: 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.tools.database_import, 'create_country_names'), + mock_func_factory(nominatim.tools.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'), @@ -220,7 +222,7 @@ class TestCliWithDb: temp_db_conn): mocks = [ mock_func_factory(nominatim.tools.database_import, 'create_search_indices'), - mock_func_factory(nominatim.tools.database_import, 'create_country_names'), + mock_func_factory(nominatim.tools.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') @@ -241,7 +243,7 @@ class TestCliWithDb: def test_import_continue_postprocess(self, mock_func_factory): mocks = [ mock_func_factory(nominatim.tools.database_import, 'create_search_indices'), - mock_func_factory(nominatim.tools.database_import, 'create_country_names'), + mock_func_factory(nominatim.tools.country_info, 'create_country_names'), mock_func_factory(nominatim.tools.refresh, 'setup_website'), mock_func_factory(nominatim.db.properties, 'set_property') ]