replace CASE construct with plpgsql function

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

diff --git a/test/python/conftest.py b/test/python/conftest.py
index 4cea9fb37ef23ab33c11861ccfeab4ba51f05ba4..314637460525e0e2f8aefac5e81b63a193b12514 100644 (file)
--- a/test/python/conftest.py
+++ b/test/python/conftest.py
@@ -1,3 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# This file is part of Nominatim. (https://nominatim.org)
+#
+# Copyright (C) 2022 by the Nominatim developer community.
+# For a full list of authors see the git log.

 import itertools
 import sys
 from pathlib import Path
 import itertools
 import sys
 from pathlib import Path


@@ -5,10 +11,9 @@ from pathlib import Path
 import psycopg2
 import pytest
 
 import psycopg2
 import pytest
 

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

 # always test against the source
 # always test against the source

-sys.path.insert(0, str(SRC_DIR.resolve()))
+SRC_DIR = (Path(__file__) / '..' / '..' / '..').resolve()
+sys.path.insert(0, str(SRC_DIR))

 
 from nominatim.config import Configuration
 from nominatim.db import connection
 
 from nominatim.config import Configuration
 from nominatim.db import connection


@@ -20,6 +25,11 @@ import mocks
 from cursor import CursorForTesting
 
 
 from cursor import CursorForTesting
 
 

+@pytest.fixture
+def src_dir():
+    return SRC_DIR
+
+

 @pytest.fixture
 def temp_db(monkeypatch):
     """ Create an empty database for the test. The database name is also
 @pytest.fixture
 def temp_db(monkeypatch):
     """ Create an empty database for the test. The database name is also


@@ -98,17 +108,18 @@ def table_factory(temp_db_cursor):
 
 @pytest.fixture
 def def_config():
 
 @pytest.fixture
 def def_config():

-    cfg = Configuration(None, SRC_DIR.resolve() / 'settings')
-    cfg.set_libdirs(module='.', osm2pgsql='.',
-                    php=SRC_DIR / 'lib-php',
-                    sql=SRC_DIR / 'lib-sql',
-                    data=SRC_DIR / 'data')
+    cfg = Configuration(None)
+    cfg.set_libdirs(module='.', osm2pgsql='.')

     return cfg
 
 
 @pytest.fixture
     return cfg
 
 
 @pytest.fixture

-def src_dir():
-    return SRC_DIR.resolve()
+def project_env(tmp_path):
+    projdir = tmp_path / 'project'
+    projdir.mkdir()
+    cfg = Configuration(projdir)
+    cfg.set_libdirs(module='.', osm2pgsql='.')
+    return cfg

 
 
 @pytest.fixture
 
 
 @pytest.fixture


@@ -194,17 +205,11 @@ def osmline_table(temp_db_with_extensions, table_factory):
                      country_code VARCHAR(2)""")
 
 
                      country_code VARCHAR(2)""")
 
 

-@pytest.fixture
-def word_table(temp_db_conn):
-    return mocks.MockWordTable(temp_db_conn)
-
-

 @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, )))

-    cfg = Configuration(None, SRC_DIR.resolve() / 'settings')
-    cfg.set_libdirs(module='.', osm2pgsql='.', php=SRC_DIR / 'lib-php',
-                    sql=tmp_path, data=SRC_DIR / 'data')
+    cfg = Configuration(None)
+    cfg.set_libdirs(module='.', osm2pgsql='.', sql=tmp_path)

     return cfg
 
 
     return cfg