Tweak tests.

Author: anthony-tuininga

tests/test_8700_sessionless_transaction.py

@@ -673,19 +673,21 @@ def test_8715(conn, cursor, test_env):
     cursor.execute(f"drop table {temp_table_name} purge")
 
 
-def test_8716(conn, cursor, test_env):
+def test_8716(test_env):
     "8716 - test suspend_on_success with batch_size < total rows inserted"
-    cursor.execute("truncate table TestTempTable")
-    rows = [(i + 1, f"String for row {i + 1}") for i in range(200)]
-    conn.begin_sessionless_transaction(
-        transaction_id=TRANSACTION_ID_CLIENT,
-        timeout=15,
-        defer_round_trip=True,
-    )
-    with test_env.assert_raises_full_code("DPY-3036"):
-        cursor.executemany(
-            "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)",
-            rows,
-            batch_size=75,
-            suspend_on_success=True,
+    with test_env.get_connection() as conn:
+        cursor = conn.cursor()
+        cursor.execute("truncate table TestTempTable")
+        rows = [(i + 1, f"String for row {i + 1}") for i in range(200)]
+        conn.begin_sessionless_transaction(
+            transaction_id=TRANSACTION_ID_CLIENT,
+            timeout=5,
+            defer_round_trip=True,
         )
+        sql = "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)"
+        with test_env.assert_raises_full_code("DPY-3036"):
+            cursor.executemany(
+                sql, rows, batch_size=75, suspend_on_success=True
+            )
+    with test_env.get_connection() as conn:
+        conn.resume_sessionless_transaction(TRANSACTION_ID_CLIENT)

tests/test_8800_sessionless_transaction_async.py

@@ -681,19 +681,21 @@ async def test_8815(async_conn, async_cursor, test_env):
     await async_cursor.execute(f"drop table {temp_table_name} purge")
 
 
-async def test_8816(async_conn, async_cursor, test_env):
+async def test_8816(test_env):
     "8816 - test suspend_on_success with batch_size < total rows inserted"
-    await async_cursor.execute("truncate table TestTempTable")
-    rows = [(i + 1, f"String for row {i + 1}") for i in range(200)]
-    await async_conn.begin_sessionless_transaction(
-        transaction_id=TRANSACTION_ID_CLIENT,
-        timeout=15,
-        defer_round_trip=True,
-    )
-    with test_env.assert_raises_full_code("DPY-3036"):
-        await async_cursor.executemany(
-            "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)",
-            rows,
-            batch_size=75,
-            suspend_on_success=True,
+    async with test_env.get_connection_async() as conn:
+        cursor = conn.cursor()
+        await cursor.execute("truncate table TestTempTable")
+        rows = [(i + 1, f"String for row {i + 1}") for i in range(200)]
+        await conn.begin_sessionless_transaction(
+            transaction_id=TRANSACTION_ID_CLIENT,
+            timeout=5,
+            defer_round_trip=True,
         )
+        sql = "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)"
+        with test_env.assert_raises_full_code("DPY-3036"):
+            await cursor.executemany(
+                sql, rows, batch_size=75, suspend_on_success=True
+            )
+    async with test_env.get_connection_async() as conn:
+        await conn.resume_sessionless_transaction(TRANSACTION_ID_CLIENT)