review fixes

Author: vgvoleg

tests/query/test_query_session_pool.py

@@ -39,9 +39,11 @@ def callee(session: QuerySessionSync):
         assert len(res) == 1
 
     def test_retry_op_raises(self, pool: QuerySessionPool):
+        class CustomException(Exception):
+            pass
+
         def callee(session: QuerySessionSync):
-            with session.execute("Caught in a landslide, no escape from reality"):
-                pass
+            raise CustomException()
 
-        with pytest.raises(ydb.GenericError):
+        with pytest.raises(CustomException):
             pool.retry_operation_sync(callee)

tests/query/test_query_transaction.py

@@ -21,15 +21,13 @@ def test_tx_allow_double_rollback(self, tx: BaseTxContext):
         tx.rollback()
         tx.rollback()
 
-    @pytest.mark.skip(reason="Not sure should we keep this behavior or not")
-    def test_tx_commit_raises_before_begin(self, tx: BaseTxContext):
-        with pytest.raises(RuntimeError):
-            tx.commit()
+    def test_tx_commit_before_begin(self, tx: BaseTxContext):
+        tx.commit()
+        assert tx._tx_state._state == QueryTxStateEnum.COMMITTED
 
-    @pytest.mark.skip(reason="Not sure should we keep this behavior or not")
-    def test_tx_rollback_raises_before_begin(self, tx: BaseTxContext):
-        with pytest.raises(RuntimeError):
-            tx.rollback()
+    def test_tx_rollback_before_begin(self, tx: BaseTxContext):
+        tx.rollback()
+        assert tx._tx_state._state == QueryTxStateEnum.ROLLBACKED
 
     def test_tx_first_execute_begins_tx(self, tx: BaseTxContext):
         tx.execute("select 1;")
@@ -67,9 +65,12 @@ def test_context_manager_normal_flow(self, tx: BaseTxContext):
         assert tx._tx_state._state == QueryTxStateEnum.COMMITTED
 
     def test_context_manager_does_not_hide_exceptions(self, tx: BaseTxContext):
-        with pytest.raises(Exception):
+        class CustomException(Exception):
+            pass
+
+        with pytest.raises(CustomException):
             with tx:
-                raise Exception()
+                raise CustomException()
 
     def test_execute_as_context_manager(self, tx: BaseTxContext):
         tx.begin()

ydb/query/transaction.py

@@ -253,7 +253,6 @@ def commit(self, settings=None):
         self._ensure_prev_stream_finished()
 
         if self._tx_state._state == QueryTxStateEnum.NOT_INITIALIZED:
-            # TODO(vgvoleg): Discuss should we raise before begin or not
             self._tx_state._change_state(QueryTxStateEnum.COMMITTED)
             self._tx_state.tx_id = None
             return
@@ -276,7 +275,6 @@ def rollback(self, settings=None):
         self._ensure_prev_stream_finished()
 
         if self._tx_state._state == QueryTxStateEnum.NOT_INITIALIZED:
-            # TODO(vgvoleg): Discuss should we raise before begin or not
             self._tx_state._change_state(QueryTxStateEnum.ROLLBACKED)
             self._tx_state.tx_id = None
             return