Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/python/conftest.py b/test/python/conftest.py
index 9a43a67e041393f9389d3918d5b0d2106dca05ab..74d3633968cb12c6c16733f997d3cd0f621c4d94 100644 (file)
--- a/test/python/conftest.py
+++ b/test/python/conftest.py
@@ -5,7 +5,7 @@ from pathlib import Path
 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()))
@@ -173,6 +173,7 @@ def place_row(place_table, temp_db_cursor):
     """ A factory for rows in the place table. The table is created as a
         prerequisite to the fixture.
     """
+    psycopg2.extras.register_hstore(temp_db_cursor)
     idseq = itertools.count(1001)
     def _insert(osm_type='N', osm_id=None, cls='amenity', typ='cafe', names=None,
                 admin_level=None, address=None, extratags=None, geom=None):
@@ -226,7 +227,7 @@ def osm2pgsql_options(temp_db):
                                  main_data='', main_index=''))
 
 @pytest.fixture
-def sql_preprocessor(temp_db_conn, tmp_path, table_factory):
+def sql_preprocessor(temp_db_conn, 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',