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..2fc9772671069c06f337c0d24ca410b1c5a093b6 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()))


@@ -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.
     """
     """ 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):
     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):