X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/2e493fec469b130f97addba94d2834f6e9099672..109af0ef1c55421a166fd2d45586d04fe7f6f969:/test/python/conftest.py diff --git a/test/python/conftest.py b/test/python/conftest.py index 2fc97726..4812e3f0 100644 --- a/test/python/conftest.py +++ b/test/python/conftest.py @@ -226,14 +226,19 @@ def osm2pgsql_options(temp_db): tablespaces=dict(slim_data='', slim_index='', main_data='', main_index='')) + @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') + 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