X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c85b74497b385a633ed3f487c77cc0736d5f7328..23dabad0b0c8c1ffd9b4973bfc9e1d739e6128d7:/test/python/cli/test_cmd_refresh.py?ds=sidebyside

diff --git a/test/python/cli/test_cmd_refresh.py b/test/python/cli/test_cmd_refresh.py
index ed3a68ba..f3f93f0f 100644
--- a/test/python/cli/test_cmd_refresh.py
+++ b/test/python/cli/test_cmd_refresh.py
@@ -24,7 +24,6 @@ class TestRefresh:
     @pytest.mark.parametrize("command,func", [
                              ('address-levels', 'load_address_levels_from_config'),
                              ('wiki-data', 'import_wikipedia_articles'),
-                             ('osm-views', 'import_osm_views_geotiff')
                              ('importance', 'recompute_importance'),
                              ('website', 'setup_website'),
                              ])
@@ -72,21 +71,27 @@ class TestRefresh:
 
         assert self.call_nominatim('refresh', '--wiki-data') == 1
 
-    def test_refresh_osm_views_geotiff_file_not_found(self, monkeypatch):
-        monkeypatch.setenv('NOMINATIM_OSM_VIEWS_DATA_PATH', 'gjoiergjeroi345Q')
+    def test_refresh_secondary_importance_file_not_found(self):
+        assert self.call_nominatim('refresh', '--secondary-importance') == 1
 
-        assert self.call_nominatim('refresh', '--osm-views') == 1
 
-    def test_refresh_importance_computed_after_wiki_and_osm_views_import(self, monkeypatch):
+    def test_refresh_secondary_importance_new_table(self, mock_func_factory):
+        mocks = [mock_func_factory(nominatim.tools.refresh, 'import_secondary_importance'),
+                 mock_func_factory(nominatim.tools.refresh, 'create_functions')]
+
+        assert self.call_nominatim('refresh', '--secondary-importance') == 0
+        assert mocks[0].called == 1
+        assert mocks[1].called == 1
+
+
+    def test_refresh_importance_computed_after_wiki_import(self, monkeypatch):
         calls = []
         monkeypatch.setattr(nominatim.tools.refresh, 'import_wikipedia_articles',
                             lambda *args, **kwargs: calls.append('import') or 0)
-        monkeypatch.setattr(nominatim.tools.refresh, 'import_osm_views_geotiff',
-                            lambda *args, **kwargs: calls.append('import') or 0)
         monkeypatch.setattr(nominatim.tools.refresh, 'recompute_importance',
                             lambda *args, **kwargs: calls.append('update'))
 
-        assert self.call_nominatim('refresh', '--importance', '--wiki-data', '--osm-views') == 0
+        assert self.call_nominatim('refresh', '--importance', '--wiki-data') == 0
 
         assert calls == ['import', 'update']