X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c170d323d93f2ea63ef1c9af8ea11dbc388cbfb2..5afd96d210ed0ad14a5d00f832f6e6a28558e733:/test/python/cli/conftest.py?ds=sidebyside diff --git a/test/python/cli/conftest.py b/test/python/cli/conftest.py index 420740cf..1bb393fb 100644 --- a/test/python/cli/conftest.py +++ b/test/python/cli/conftest.py @@ -38,38 +38,26 @@ class DummyTokenizer: def finalize_import(self, *args): self.finalize_import_called = True - def update_statistics(self): + def update_statistics(self, *args): self.update_statistics_called = True - def update_word_tokens(self): + def update_word_tokens(self, *args): self.update_word_tokens_called = True @pytest.fixture -def cli_call(src_dir): +def cli_call(): """ Call the nominatim main function with the correct paths set. Returns a function that can be called with the desired CLI arguments. """ def _call_nominatim(*args): return nominatim.cli.nominatim(module_dir='MODULE NOT AVAILABLE', osm2pgsql_path='OSM2PGSQL NOT AVAILABLE', - phplib_dir=str(src_dir / 'lib-php'), - data_dir=str(src_dir / 'data'), - phpcgi_path='/usr/bin/php-cgi', - sqllib_dir=str(src_dir / 'lib-sql'), - config_dir=str(src_dir / 'settings'), cli_args=args) return _call_nominatim -@pytest.fixture -def mock_run_legacy(monkeypatch): - mock = MockParamCapture() - monkeypatch.setattr(nominatim.cli, 'run_legacy_script', mock) - return mock - - @pytest.fixture def mock_func_factory(monkeypatch): def get_mock(module, func):