move import-data option to native python

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

diff --git a/test/python/test_db_utils.py b/test/python/test_db_utils.py
index 3210721e7f16e241440e63e758cad3a3a1664581..1c3b834a6727f0befbf9f85edca30bce98383f44 100644 (file)
--- 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
 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);')
 
     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)')
 
     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)