replace NOMINATIM_PHRASE_CONFIG with command line option

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

diff --git a/test/python/conftest.py b/test/python/conftest.py
index 1fca4b6205baffae7c5bbb6d2b08423f06ce367c..4812e3f00a2710bf52e6b2315b4f029c2e953407 100644 (file)
--- a/test/python/conftest.py
+++ b/test/python/conftest.py
@@ -5,7 +5,7 @@ from pathlib import Path
 import psycopg2
 import pytest
 
 import psycopg2
 import pytest
 

-SRC_DIR = Path(__file__) / '..' / '..' / '..'
+SRC_DIR = (Path(__file__) / '..' / '..' / '..').resolve()

 
 # always test against the source
 sys.path.insert(0, str(SRC_DIR.resolve()))
 
 # always test against the source
 sys.path.insert(0, str(SRC_DIR.resolve()))


@@ -226,14 +226,19 @@ def osm2pgsql_options(temp_db):
                 tablespaces=dict(slim_data='', slim_index='',
                                  main_data='', main_index=''))
 
                 tablespaces=dict(slim_data='', slim_index='',
                                  main_data='', main_index=''))
 

+

 @pytest.fixture
 @pytest.fixture

-def sql_preprocessor(temp_db_conn, tmp_path, table_factory):
+def sql_preprocessor_cfg(tmp_path, table_factory, temp_db_with_extensions):

     table_factory('country_name', 'partition INT', ((0, ), (1, ), (2, )))
     cfg = Configuration(None, SRC_DIR.resolve() / 'settings')
     cfg.set_libdirs(module='.', osm2pgsql='.', php=SRC_DIR / 'lib-php',
                     sql=tmp_path, data=SRC_DIR / 'data')
     table_factory('country_name', 'partition INT', ((0, ), (1, ), (2, )))
     cfg = Configuration(None, SRC_DIR.resolve() / 'settings')
     cfg.set_libdirs(module='.', osm2pgsql='.', php=SRC_DIR / 'lib-php',
                     sql=tmp_path, data=SRC_DIR / 'data')

+    return cfg

 
 

-    return SQLPreprocessor(temp_db_conn, cfg)
+
+@pytest.fixture
+def sql_preprocessor(sql_preprocessor_cfg, temp_db_conn):
+    return SQLPreprocessor(temp_db_conn, sql_preprocessor_cfg)

 
 
 @pytest.fixture
 
 
 @pytest.fixture