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 17c6697dbeaa3ef28772d022ffa20403e5729f00..d098e27e24cdb73125aef3d82ba29cd6cbef98c6 100644 (file)
--- a/test/python/cli/test_cmd_import.py
+++ b/test/python/cli/test_cmd_import.py
@@ -40,7 +40,7 @@ class TestCliImportWithDb:
             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.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.refresh, 'import_secondary_importance'),

             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, 'truncate_data_tables'),
             mock_func_factory(nominatim.tools.database_import, 'load_data'),
             mock_func_factory(nominatim.tools.database_import, 'create_tables'),


@@ -69,7 +69,7 @@ class TestCliImportWithDb:
         assert cf_mock.called > 1
 
         for mock in mocks:
         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):
 
 
     def test_import_continue_load_data(self, mock_func_factory):