reorganize code around result formatting

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

diff --git a/test/python/cli/conftest.py b/test/python/cli/conftest.py
index ebf0cf0cd827148aec9f74c34b391137c5d8b47a..09bfd3534ad4ee96032e49db1d18d70eee9d5f32 100644 (file)
--- a/test/python/cli/conftest.py
+++ b/test/python/cli/conftest.py
@@ -1,3 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# This file is part of Nominatim. (https://nominatim.org)
+#
+# Copyright (C) 2022 by the Nominatim developer community.
+# For a full list of authors see the git log.

 import pytest
 
 import nominatim.cli
 import pytest
 
 import nominatim.cli


@@ -24,6 +30,7 @@ class DummyTokenizer:
         self.update_sql_functions_called = False
         self.finalize_import_called = False
         self.update_statistics_called = False
         self.update_sql_functions_called = False
         self.finalize_import_called = False
         self.update_statistics_called = False

+        self.update_word_tokens_called = False

 
     def update_sql_functions(self, *args):
         self.update_sql_functions_called = True
 
     def update_sql_functions(self, *args):
         self.update_sql_functions_called = True


@@ -34,6 +41,9 @@ class DummyTokenizer:
     def update_statistics(self):
         self.update_statistics_called = True
 
     def update_statistics(self):
         self.update_statistics_called = True
 

+    def update_word_tokens(self):
+        self.update_word_tokens_called = True
+

 
 @pytest.fixture
 def cli_call(src_dir):
 
 @pytest.fixture
 def cli_call(src_dir):


@@ -43,11 +53,7 @@ def cli_call(src_dir):
     def _call_nominatim(*args):
         return nominatim.cli.nominatim(module_dir='MODULE NOT AVAILABLE',
                                        osm2pgsql_path='OSM2PGSQL NOT AVAILABLE',
     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',
                                        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