X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e6c2842b66c607400a0a95b7b8e8de8cd5b12d51..32683f73c787464e16f2a146d4c08c4041087dd5:/test/python/test_db_utils.py diff --git a/test/python/test_db_utils.py b/test/python/test_db_utils.py index 3210721e..1c3b834a 100644 --- a/test/python/test_db_utils.py +++ b/test/python/test_db_utils.py @@ -5,29 +5,38 @@ import psycopg2 import pytest import nominatim.db.utils as db_utils +from nominatim.errors import UsageError -def test_execute_file_success(temp_db, tmp_path): +@pytest.fixture +def dsn(temp_db): + return 'dbname=' + temp_db + +def test_execute_file_success(dsn, temp_db_cursor, tmp_path): tmpfile = tmp_path / 'test.sql' tmpfile.write_text('CREATE TABLE test (id INT);\nINSERT INTO test VALUES(56);') - with psycopg2.connect('dbname=' + temp_db) as conn: - db_utils.execute_file(conn, tmpfile) + db_utils.execute_file(dsn, tmpfile) + + temp_db_cursor.execute('SELECT * FROM test') + + assert temp_db_cursor.rowcount == 1 + assert temp_db_cursor.fetchone()[0] == 56 + +def test_execute_file_bad_file(dsn, tmp_path): + with pytest.raises(FileNotFoundError): + db_utils.execute_file(dsn, tmp_path / 'test2.sql') - with conn.cursor() as cur: - cur.execute('SELECT * FROM test') - assert cur.rowcount == 1 - assert cur.fetchone()[0] == 56 +def test_execute_file_bad_sql(dsn, tmp_path): + tmpfile = tmp_path / 'test.sql' + tmpfile.write_text('CREATE STABLE test (id INT)') + + with pytest.raises(UsageError): + db_utils.execute_file(dsn, tmpfile) -def test_execute_file_bad_file(temp_db, tmp_path): - with psycopg2.connect('dbname=' + temp_db) as conn: - with pytest.raises(FileNotFoundError): - db_utils.execute_file(conn, tmp_path / 'test2.sql') -def test_execute_file_bad_sql(temp_db, tmp_path): +def test_execute_file_bad_sql_ignore_errors(dsn, tmp_path): tmpfile = tmp_path / 'test.sql' tmpfile.write_text('CREATE STABLE test (id INT)') - with psycopg2.connect('dbname=' + temp_db) as conn: - with pytest.raises(psycopg2.ProgrammingError): - db_utils.execute_file(conn, tmpfile) + db_utils.execute_file(dsn, tmpfile, ignore_errors=True)