X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/d2bd6aa78dc467aea4d395c9406d7088aca233ce..5071710db7832d13341230c9942bc7030a0ec6dc:/test/python/test_tools_refresh_create_functions.py diff --git a/test/python/test_tools_refresh_create_functions.py b/test/python/test_tools_refresh_create_functions.py index 40d4c81a..53ea2b52 100644 --- a/test/python/test_tools_refresh_create_functions.py +++ b/test/python/test_tools_refresh_create_functions.py @@ -5,6 +5,11 @@ import pytest from nominatim.tools.refresh import create_functions +@pytest.fixture +def sql_tmp_path(tmp_path, def_config): + def_config.lib_dir.sql = tmp_path + return tmp_path + @pytest.fixture def conn(temp_db_conn, table_factory, monkeypatch): monkeypatch.setenv('NOMINATIM_DATABASE_MODULE_PATH', '.') @@ -12,8 +17,8 @@ def conn(temp_db_conn, table_factory, monkeypatch): return temp_db_conn -def test_create_functions(temp_db_cursor, conn, def_config, tmp_path): - sqlfile = tmp_path / 'functions.sql' +def test_create_functions(temp_db_cursor, conn, def_config, sql_tmp_path): + sqlfile = sql_tmp_path / 'functions.sql' sqlfile.write_text("""CREATE OR REPLACE FUNCTION test() RETURNS INTEGER AS $$ BEGIN @@ -22,14 +27,14 @@ def test_create_functions(temp_db_cursor, conn, def_config, tmp_path): $$ LANGUAGE plpgsql IMMUTABLE; """) - create_functions(conn, def_config, tmp_path) + create_functions(conn, def_config) assert temp_db_cursor.scalar('SELECT test()') == 43 @pytest.mark.parametrize("dbg,ret", ((True, 43), (False, 22))) -def test_create_functions_with_template(temp_db_cursor, conn, def_config, tmp_path, dbg, ret): - sqlfile = tmp_path / 'functions.sql' +def test_create_functions_with_template(temp_db_cursor, conn, def_config, sql_tmp_path, dbg, ret): + sqlfile = sql_tmp_path / 'functions.sql' sqlfile.write_text("""CREATE OR REPLACE FUNCTION test() RETURNS INTEGER AS $$ BEGIN @@ -42,6 +47,6 @@ def test_create_functions_with_template(temp_db_cursor, conn, def_config, tmp_pa $$ LANGUAGE plpgsql IMMUTABLE; """) - create_functions(conn, def_config, tmp_path, enable_debug=dbg) + create_functions(conn, def_config, enable_debug=dbg) assert temp_db_cursor.scalar('SELECT test()') == ret