X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/45d13bc295dbe83940ae47aaa4ee3b9032a46df4..5b02cd22b9d9bdf9d3cd32d9e4cfcb971a92c606:/test/python/cli/conftest.py diff --git a/test/python/cli/conftest.py b/test/python/cli/conftest.py index 09bfd353..28aba597 100644 --- a/test/python/cli/conftest.py +++ b/test/python/cli/conftest.py @@ -32,40 +32,32 @@ class DummyTokenizer: self.update_statistics_called = False self.update_word_tokens_called = False - def update_sql_functions(self, *args): + def update_sql_functions(self, *args, **kwargs): self.update_sql_functions_called = True - def finalize_import(self, *args): + def finalize_import(self, *args, **kwargs): self.finalize_import_called = True - def update_statistics(self): + def update_statistics(self, *args, **kwargs): self.update_statistics_called = True - def update_word_tokens(self): + def update_word_tokens(self, *args, **kwargs): 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', - phpcgi_path='/usr/bin/php-cgi', 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):