test: actually test server cursors when row makers return None

diff --git a/tests/test_cursor_server.py b/tests/test_cursor_server.py
index 01cc8e617320a49678719add65cd623ccfecc4b6..13b08006b1a1698b780ee83a7c045254f41440ac 100644 (file)
--- a/tests/test_cursor_server.py
+++ b/tests/test_cursor_server.py
@@ -566,17 +566,16 @@ def test_stolen_cursor_close(conn):
 
 
 def test_row_maker_returns_none(conn):
-    cur = conn.cursor(row_factory=rows.scalar_row)
     query = "values (null), (0)"
     recs = [None, 0]
-
-    cur.execute(query)
-    assert [cur.fetchone() for _ in range(len(recs))] == recs
-    cur.execute(query)
-    assert cur.fetchmany(len(recs)) == recs
-    cur.execute(query)
-    assert cur.fetchall() == recs
-    cur.execute(query)
-    assert list(cur) == recs
-    stream = cur.stream(query)
-    assert list(stream) == recs
+    with conn.cursor("test", row_factory=rows.scalar_row) as cur:
+        cur.execute(query)
+        assert [cur.fetchone() for _ in range(len(recs))] == recs
+        cur.execute(query)
+        assert cur.fetchmany(len(recs)) == recs
+        cur.execute(query)
+        assert cur.fetchall() == recs
+        cur.execute(query)
+        assert list(cur) == recs
+        stream = cur.stream(query)
+        assert list(stream) == recs

diff --git a/tests/test_cursor_server_async.py b/tests/test_cursor_server_async.py
index 377d057f4bb9aed017cf9a93aeafa1167dbfe726..725c4b64bb8a34b29c3c6842b7736e0f0b1051e8 100644 (file)
--- a/tests/test_cursor_server_async.py
+++ b/tests/test_cursor_server_async.py
@@ -572,17 +572,16 @@ async def test_stolen_cursor_close(aconn):
 
 
 async def test_row_maker_returns_none(aconn):
-    cur = aconn.cursor(row_factory=rows.scalar_row)
     query = "values (null), (0)"
     recs = [None, 0]
-
-    await cur.execute(query)
-    assert [await cur.fetchone() for _ in range(len(recs))] == recs
-    await cur.execute(query)
-    assert await cur.fetchmany(len(recs)) == recs
-    await cur.execute(query)
-    assert await cur.fetchall() == recs
-    await cur.execute(query)
-    assert await alist(cur) == recs
-    stream = cur.stream(query)
-    assert await alist(stream) == recs
+    async with aconn.cursor("test", row_factory=rows.scalar_row) as cur:
+        await cur.execute(query)
+        assert [await cur.fetchone() for _ in range(len(recs))] == recs
+        await cur.execute(query)
+        assert await cur.fetchmany(len(recs)) == recs
+        await cur.execute(query)
+        assert await cur.fetchall() == recs
+        await cur.execute(query)
+        assert await alist(cur) == recs
+        stream = cur.stream(query)
+        assert await alist(stream) == recs