From eca02fb38fcdcd89d68d509c0616743c7b8319fd Mon Sep 17 00:00:00 2001 From: Daniele Varrazzo Date: Fri, 9 May 2025 13:10:46 +0200 Subject: [PATCH] test: actually test server cursors when row makers return None --- tests/test_cursor_server.py | 23 +++++++++++------------ tests/test_cursor_server_async.py | 23 +++++++++++------------ 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/tests/test_cursor_server.py b/tests/test_cursor_server.py index 01cc8e617..13b08006b 100644 --- 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 377d057f4..725c4b64b 100644 --- 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 -- 2.47.3