Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/python/test_db_async_connection.py b/test/python/test_db_async_connection.py
index b52f7053f4a8d601facfbf48a924ae564b7688e3..7398eac3c0297819adb32a4e9a01b8b1d9ddf2da 100644 (file)
--- a/test/python/test_db_async_connection.py
+++ b/test/python/test_db_async_connection.py
@@ -6,15 +6,14 @@ import concurrent.futures
 
 import pytest
 import psycopg2
 
 import pytest
 import psycopg2

-from psycopg2.extras import wait_select

 
 from nominatim.db.async_connection import DBConnection, DeadlockHandler
 
 
 @pytest.fixture
 def conn(temp_db):
 
 from nominatim.db.async_connection import DBConnection, DeadlockHandler
 
 
 @pytest.fixture
 def conn(temp_db):

-    with closing(DBConnection('dbname=' + temp_db)) as c:
-        yield c
+    with closing(DBConnection('dbname=' + temp_db)) as connection:
+        yield connection

 
 
 @pytest.fixture
 
 
 @pytest.fixture


@@ -56,13 +55,21 @@ def test_bad_query(conn):
         conn.wait()
 
 
         conn.wait()
 
 

+def test_bad_query_ignore(temp_db):
+    with closing(DBConnection('dbname=' + temp_db, ignore_sql_errors=True)) as conn:
+        conn.connect()
+
+        conn.perform('SELECT efasfjsea')
+
+        conn.wait()
+
+

 def exec_with_deadlock(cur, sql, detector):
     with DeadlockHandler(lambda *args: detector.append(1)):
         cur.execute(sql)
 
 
 def test_deadlock(simple_conns):
 def exec_with_deadlock(cur, sql, detector):
     with DeadlockHandler(lambda *args: detector.append(1)):
         cur.execute(sql)
 
 
 def test_deadlock(simple_conns):

-    print(psycopg2.__version__)

     cur1, cur2 = simple_conns
 
     cur1.execute("""CREATE TABLE t1 (id INT PRIMARY KEY, t TEXT);
     cur1, cur2 = simple_conns
 
     cur1.execute("""CREATE TABLE t1 (id INT PRIMARY KEY, t TEXT);


@@ -98,5 +105,3 @@ def test_deadlock(simple_conns):
         future.result()
 
         assert len(deadlock_check) == 1
         future.result()
 
         assert len(deadlock_check) == 1

-
-