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 09bfd3534ad4ee96032e49db1d18d70eee9d5f32..28aba597e7de38d324ebadaa1e6ef67e62b84b82 100644 (file)
--- 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
 
         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
 
         self.update_sql_functions_called = True
 

-    def finalize_import(self, *args):
+    def finalize_import(self, *args, **kwargs):

         self.finalize_import_called = True
 
         self.finalize_import_called = True
 

-    def update_statistics(self):
+    def update_statistics(self, *args, **kwargs):

         self.update_statistics_called = True
 
         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
         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',
     """ 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
 
 
                                        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):