Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/python/cli/conftest.py b/test/python/cli/conftest.py
index 420740cfc65568abf9b2dae1a53e3245ae6a434d..7aea2c5917c8c716f679ec975df0bedd61a7f058 100644 (file)
--- a/test/python/cli/conftest.py
+++ b/test/python/cli/conftest.py
@@ -46,30 +46,18 @@ class DummyTokenizer:
 
 
 @pytest.fixture
 
 
 @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',
     """ 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
 
 
                                        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):
 @pytest.fixture
 def mock_func_factory(monkeypatch):
     def get_mock(module, func):