fix test_transaction

Author: wwwjfy

mysql_tests/conftest.py

@@ -35,7 +35,9 @@ async def engine(sa_engine):
 @pytest.fixture
 @async_generator
 async def bind(sa_engine):
-    async with db.with_bind(MYSQL_URL, echo=ECHO, autocommit=True) as e:
+    async with db.with_bind(
+        MYSQL_URL, echo=ECHO, minsize=10, autocommit=True,
+    ) as e:
         await yield_(e)
     sa_engine.execute("DELETE FROM gino_user_settings")
     sa_engine.execute("DELETE FROM gino_users")

mysql_tests/test_transaction.py

@@ -40,7 +40,7 @@ async def test_connection_ctx(bind, mocker):
         tx = await conn.transaction().__aenter__()
         await u.update(nickname="rollback").apply()
         assert await get_name() == "rollback"
-        mocker.patch("asyncpg.transaction.Transaction.commit").side_effect = IndexError
+        mocker.patch("aiomysql.connection.Connection.commit").side_effect = IndexError
         with pytest.raises(IndexError):
             await tx.__aexit__(None, None, None)
         # clean up, and to simulate commit failed
@@ -102,38 +102,38 @@ async def test_engine(bind):
 
 
 async def test_begin_failed(bind, mocker):
-    from asyncpg.transaction import Transaction
+    from aiomysql.connection import Connection
 
     init_size = qsize(bind)
-    mocker.patch("asyncpg.transaction.Transaction.start")
-    Transaction.start.side_effect = ZeroDivisionError
+    mocker.patch("aiomysql.connection.Connection.begin")
+    Connection.begin.side_effect = ZeroDivisionError
     with pytest.raises(ZeroDivisionError):
         async with bind.transaction():
             pass  # pragma: no cover
     assert init_size == qsize(bind)
 
 
 async def test_commit_failed(bind, mocker):
-    from asyncpg.transaction import Transaction
+    from aiomysql.connection import Connection
 
     init_size = qsize(bind)
-    mocker.patch("asyncpg.transaction.Transaction._Transaction__commit")
+    mocker.patch("aiomysql.connection.Connection.begin")
     # noinspection PyUnresolvedReferences,PyProtectedMember
-    Transaction._Transaction__commit.side_effect = ZeroDivisionError
+    Connection.begin.side_effect = ZeroDivisionError
     with pytest.raises(ZeroDivisionError):
         async with bind.transaction():
             pass
     assert init_size == qsize(bind)
 
 
 async def test_reuse(bind):
-    from asyncpg.transaction import Transaction
+    from aiomysql.connection import Connection
 
     init_size = qsize(bind)
     async with db.acquire() as conn:
         async with db.transaction() as tx:
             assert tx.connection.raw_connection is conn.raw_connection
-            assert isinstance(tx.raw_transaction, Transaction)
+            assert isinstance(tx.raw_transaction, Connection)
             async with db.transaction() as tx2:
                 assert tx2.connection.raw_connection is conn.raw_connection
             async with db.transaction(reuse=False) as tx2:
@@ -256,7 +256,7 @@ async def test_base_exception(engine):
 
 
 async def test_no_rollback_on_commit_fail(engine, mocker):
-    mocker.patch("asyncpg.transaction.Transaction.commit").side_effect = IndexError
+    mocker.patch("aiomysql.connection.Connection.commit").side_effect = IndexError
     async with engine.acquire() as conn:
         tx = await conn.transaction().__aenter__()
         rollback = mocker.patch.object(tx._tx, "rollback")

src/gino/crud.py

@@ -808,7 +808,7 @@ async def _query_and_update(bind, item, query, cols, execution_opts):
         # "dirty" row
         release_conn = False
         if not isinstance(bind, GinoConnection):
-            conn = await bind.acquire()
+            conn = await bind.acquire(reuse=True)
             release_conn = True
         else:
             conn = bind

src/gino/dialects/aiomysql.py

@@ -339,7 +339,7 @@ def __init__(self, conn, set_isolation=None):
 
     @property
     def raw_transaction(self):
-        raise NotImplementedError
+        return self._conn
 
     async def begin(self):
         await self._conn.begin()