Merge branch 'failed-trans'

Author: fantix

gino/transaction.py

@@ -166,16 +166,10 @@ async def __aenter__(self):
         return self
 
     async def __aexit__(self, ex_type, ex, ex_tb):
-        try:
-            is_break = ex_type is _Break
-            if is_break and ex.commit:
-                ex_type = None
-            if ex_type is None:
-                await self._tx.commit()
-            else:
-                await self._tx.rollback()
-        except Exception:
+        is_break = ex_type is _Break
+        if is_break and ex.commit or ex_type is None:
+            await self._tx.commit()
+        else:
             await self._tx.rollback()
-            raise
         if is_break and ex.tx is self:
             return True

tests/test_transaction.py

@@ -43,6 +43,9 @@ async def test_connection_ctx(bind, mocker):
             'asyncpg.transaction.Transaction.commit').side_effect = IndexError
         with pytest.raises(IndexError):
             await tx.__aexit__(None, None, None)
+        # clean up, and to simulate commit failed
+        mocker.stopall()
+        await tx._tx.rollback()
         assert await get_name() == 'commit'
     assert await get_name() == 'commit'
 
@@ -249,3 +252,14 @@ async def test_base_exception(engine):
         except Exception:
             assert False, 'Should not reach here'
         assert False, 'Should not reach here'
+
+
+async def test_no_rollback_on_commit_fail(engine, mocker):
+    mocker.patch(
+        'asyncpg.transaction.Transaction.commit').side_effect = IndexError
+    async with engine.acquire() as conn:
+        tx = await conn.transaction().__aenter__()
+        rollback = mocker.patch.object(tx._tx, 'rollback')
+        with pytest.raises(IndexError):
+            await tx.__aexit__(None, None, None)
+        assert not rollback.called