python test: move single-use fixtures to subdirectories

diff --git a/test/python/cli/conftest.py b/test/python/cli/conftest.py
new file mode 100644 (file)
index 0000000..183696a
--- /dev/null
+++ b/test/python/cli/conftest.py
@@ -0,0 +1,21 @@
+import pytest
+
+import nominatim.cli
+
+@pytest.fixture
+def cli_call(src_dir):
+    """ 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
+

diff --git a/test/python/conftest.py b/test/python/conftest.py
index 4812e3f00a2710bf52e6b2315b4f029c2e953407..4cea9fb37ef23ab33c11861ccfeab4ba51f05ba4 100644 (file)
--- a/test/python/conftest.py
+++ b/test/python/conftest.py
@@ -14,7 +14,6 @@ from nominatim.config import Configuration
 from nominatim.db import connection
 from nominatim.db.sql_preprocessor import SQLPreprocessor
 import nominatim.tokenizer.factory
 from nominatim.db import connection
 from nominatim.db.sql_preprocessor import SQLPreprocessor
 import nominatim.tokenizer.factory

-import nominatim.cli

 
 import dummy_tokenizer
 import mocks
 
 import dummy_tokenizer
 import mocks


@@ -112,21 +111,6 @@ def src_dir():
     return SRC_DIR.resolve()
 
 
     return SRC_DIR.resolve()
 
 

-@pytest.fixture
-def cli_call():
-    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 property_table(table_factory, temp_db_conn):
     table_factory('nominatim_properties', 'property TEXT, value TEXT')
 @pytest.fixture
 def property_table(table_factory, temp_db_conn):
     table_factory('nominatim_properties', 'property TEXT, value TEXT')


@@ -215,18 +199,6 @@ def word_table(temp_db_conn):
     return mocks.MockWordTable(temp_db_conn)
 
 
     return mocks.MockWordTable(temp_db_conn)
 
 

-@pytest.fixture
-def osm2pgsql_options(temp_db):
-    return dict(osm2pgsql='echo',
-                osm2pgsql_cache=10,
-                osm2pgsql_style='style.file',
-                threads=1,
-                dsn='dbname=' + temp_db,
-                flatnode_file='',
-                tablespaces=dict(slim_data='', slim_index='',
-                                 main_data='', main_index=''))
-
-

 @pytest.fixture
 def sql_preprocessor_cfg(tmp_path, table_factory, temp_db_with_extensions):
     table_factory('country_name', 'partition INT', ((0, ), (1, ), (2, )))
 @pytest.fixture
 def sql_preprocessor_cfg(tmp_path, table_factory, temp_db_with_extensions):
     table_factory('country_name', 'partition INT', ((0, ), (1, ), (2, )))

diff --git a/test/python/tools/conftest.py b/test/python/tools/conftest.py
new file mode 100644 (file)
index 0000000..f72caf3
--- /dev/null
+++ b/test/python/tools/conftest.py
@@ -0,0 +1,14 @@
+import pytest
+
+@pytest.fixture
+def osm2pgsql_options(temp_db):
+    """ A standard set of options for osm2pgsql.
+    """
+    return dict(osm2pgsql='echo',
+                osm2pgsql_cache=10,
+                osm2pgsql_style='style.file',
+                threads=1,
+                dsn='dbname=' + temp_db,
+                flatnode_file='',
+                tablespaces=dict(slim_data='', slim_index='',
+                                 main_data='', main_index=''))