From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Fri, 9 May 2025 11:10:46 +0000 (+0200)
Subject: test: actually test server cursors when row makers return None
X-Git-Tag: 3.2.8~15^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00e67ff4a5c3baefe8c0e308b384071241411cf9;p=thirdparty%2Fpsycopg.git

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 0c28447bc..a295d9aae 100644
--- a/tests/test_cursor_server.py
+++ b/tests/test_cursor_server.py
@@ -557,17 +557,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 014223c31..eeb198d3b 100644
--- a/tests/test_cursor_server_async.py
+++ b/tests/test_cursor_server_async.py
@@ -563,17 +563,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