Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / python / cli / test_cmd_refresh.py

diff --git a/test/python/cli/test_cmd_refresh.py b/test/python/cli/test_cmd_refresh.py
index 211c1d64fe4d9441d93f36074e1e3e7ceb82d331..f3f93f0ff3409553c73470f7a612a1b10cd663d1 100644 (file)
--- 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'),
     @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'),
                              ])
                              ('importance', 'recompute_importance'),
                              ('website', 'setup_website'),
                              ])


@@ -72,8 +71,18 @@ class TestRefresh:
 
         assert self.call_nominatim('refresh', '--wiki-data') == 1
 
 
         assert self.call_nominatim('refresh', '--wiki-data') == 1
 

-    def test_refresh_osm_views_geotiff_file_not_found(self):
-        assert self.call_nominatim('refresh', '--osm-views') == 1
+    def test_refresh_secondary_importance_file_not_found(self):
+        assert self.call_nominatim('refresh', '--secondary-importance') == 1
+
+
+    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 = []
 
     def test_refresh_importance_computed_after_wiki_import(self, monkeypatch):
         calls = []