X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/c85b74497b385a633ed3f487c77cc0736d5f7328..ac467c7a2d8cfdcf23f979644e9620f4189ec7ec:/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 ed3a68ba..af06d161 100644 --- a/test/python/cli/test_cmd_refresh.py +++ b/test/python/cli/test_cmd_refresh.py @@ -24,7 +24,7 @@ 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') + ('osm-views', 'import_osm_views_geotiff'), ('importance', 'recompute_importance'), ('website', 'setup_website'), ]) @@ -32,7 +32,7 @@ class TestRefresh: func_mock = mock_func_factory(nominatim.tools.refresh, func) assert self.call_nominatim('refresh', '--' + command) == 0 - assert func_mock.called == 1 + assert func_mock.called > 0 def test_refresh_word_count(self): @@ -72,21 +72,17 @@ 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_osm_views_geotiff_file_not_found(self): assert self.call_nominatim('refresh', '--osm-views') == 1 - def test_refresh_importance_computed_after_wiki_and_osm_views_import(self, monkeypatch): + 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']