Make cursor tests mypy-clean

Add a type annotation to 'rns' in test_rownumber(); assert that
cursor._query is not None.

diff --git a/pyproject.toml b/pyproject.toml
index 149c32cde8db10f0fdaf3e2b9dba972d46813bfa..837794df5cbf41a889c045460caf27234c5959e7 100644 (file)
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -31,6 +31,7 @@ files = [
     "tests/test_prepared*.py",
     "tests/test_psycopg_dbapi20.py",
     "tests/test_sql.py",
+    "tests/test_*cursor*.py",
     "tests/types",
 ]
 warn_unused_ignores = true

diff --git a/tests/test_cursor.py b/tests/test_cursor.py
index f6d01136b8c7cf6b9a2d20f4be48a0d80eae612b..4f8219bdd5992b72b8ec395698ef1384ac6483ac 100644 (file)
--- a/tests/test_cursor.py
+++ b/tests/test_cursor.py
@@ -2,6 +2,7 @@ import gc
 import pickle
 import weakref
 import datetime as dt
+from typing import List
 
 import pytest
 
@@ -343,8 +344,9 @@ def test_rownumber(conn):
     assert cur.rownumber == 2
     cur.fetchmany(10)
     assert cur.rownumber == 12
-    rns = []
+    rns: List[int] = []
     for i in cur:
+        assert cur.rownumber
         rns.append(cur.rownumber)
         if len(rns) >= 3:
             break
@@ -470,6 +472,7 @@ def test_query_params_execute(conn):
     assert cur._query is None
 
     cur.execute("select %t, %s::text", [1, None])
+    assert cur._query is not None
     assert cur._query.query == b"select $1, $2::text"
     assert cur._query.params == [b"1", None]
 

diff --git a/tests/test_cursor_async.py b/tests/test_cursor_async.py
index 5ff9ea770b5a931921ed78fce042ce7b2aafa637..70bd3fc571d81ec2c6a2a9191f6cfc29f062da63 100644 (file)
--- a/tests/test_cursor_async.py
+++ b/tests/test_cursor_async.py
@@ -2,6 +2,7 @@ import gc
 import pytest
 import weakref
 import datetime as dt
+from typing import List
 
 import psycopg
 from psycopg import pq, sql, rows
@@ -345,8 +346,9 @@ async def test_rownumber(aconn):
     assert cur.rownumber == 2
     await cur.fetchmany(10)
     assert cur.rownumber == 12
-    rns = []
+    rns: List[int] = []
     async for i in cur:
+        assert cur.rownumber
         rns.append(cur.rownumber)
         if len(rns) >= 3:
             break
@@ -472,6 +474,7 @@ async def test_query_params_execute(aconn):
     assert cur._query is None
 
     await cur.execute("select %t, %s::text", [1, None])
+    assert cur._query is not None
     assert cur._query.query == b"select $1, $2::text"
     assert cur._query.params == [b"1", None]
 

diff --git a/tests/test_server_cursor.py b/tests/test_server_cursor.py
index a35aad107fc4257dc08d899fe858b6635bd66a93..196c703f2acefebf8e011561fd3785e8bcbbe684 100644 (file)
--- a/tests/test_server_cursor.py
+++ b/tests/test_server_cursor.py
@@ -45,6 +45,7 @@ def test_query_params(conn):
     with conn.cursor("foo") as cur:
         assert cur._query is None
         cur.execute("select generate_series(1, %s) as bar", (3,))
+        assert cur._query
         assert b"declare" in cur._query.query.lower()
         assert b"(1, $1)" in cur._query.query.lower()
         assert cur._query.params == [bytes([0, 3])]  # 3 as binary int2

diff --git a/tests/test_server_cursor_async.py b/tests/test_server_cursor_async.py
index fc01db25b9b6ed0573324dfdb9ac7fcab71854c4..6da86735163df537e0b6aa2ecc75e78d0c4a2362 100644 (file)
--- a/tests/test_server_cursor_async.py
+++ b/tests/test_server_cursor_async.py
@@ -47,6 +47,7 @@ async def test_query_params(aconn):
     async with aconn.cursor("foo") as cur:
         assert cur._query is None
         await cur.execute("select generate_series(1, %s) as bar", (3,))
+        assert cur._query is not None
         assert b"declare" in cur._query.query.lower()
         assert b"(1, $1)" in cur._query.query.lower()
         assert cur._query.params == [bytes([0, 3])]  # 3 as binary int2