Expect exception raised when committing or aborting a txn that finished

aerospike · Jan 3, 2025 · 5d4c635 · 5d4c635
1 parent 0b879e6
commit 5d4c635
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/main/exception.c b/src/main/exception.c
@@ -111,8 +111,13 @@ struct exception_def exception_defs[] = {
                   AEROSPIKE_ERR_ASYNC_CONNECTION, NULL),
     EXCEPTION_DEF("ClientAbortError", CLIENT_ERR_EXCEPTION_NAME,
                   AEROSPIKE_ERR_CLIENT_ABORT, NULL),
-    EXCEPTION_DEF("TranactionFailed", CLIENT_ERR_EXCEPTION_NAME,
+    EXCEPTION_DEF("TransactionFailed", CLIENT_ERR_EXCEPTION_NAME,
                   AEROSPIKE_TXN_FAILED, NULL),
+    EXCEPTION_DEF("TransactionAlreadyCommitted", CLIENT_ERR_EXCEPTION_NAME,
+                  AEROSPIKE_TXN_ALREADY_COMMITTED, NULL),
+    EXCEPTION_DEF("TransactionAlreadyAborted", CLIENT_ERR_EXCEPTION_NAME,
+                  AEROSPIKE_TXN_ALREADY_ABORTED, NULL),
+
     // Server errors
     EXCEPTION_DEF("InvalidRequest", SERVER_ERR_EXCEPTION_NAME,
                   AEROSPIKE_ERR_REQUEST_INVALID, NULL),

diff --git a/test/new_tests/test_mrt_functionality.py b/test/new_tests/test_mrt_functionality.py
@@ -89,8 +89,8 @@ def test_commit_fail(self):
         }
         self.as_connection.put(self.keys[0], {self.bin_name: 1}, policy=policy)
         self.as_connection.abort(mrt)
-        status = self.as_connection.commit(mrt)
-        assert status == aerospike.MRT_COMMIT_ALREADY_ABORTED
+        with pytest.raises(e.TransactionAlreadyAborted):
+            self.as_connection.commit(mrt)
 
     # Test case 10: Issue abort after issung commit. (P1)
     def test_abort_fail(self):
@@ -100,5 +100,5 @@ def test_abort_fail(self):
         }
         self.as_connection.put(self.keys[0], {self.bin_name: 1}, policy=policy)
         self.as_connection.commit(mrt)
-        status = self.as_connection.abort(mrt)
-        assert status == aerospike.MRT_ABORT_ALREADY_COMMITTED
+        with pytest.raises(e.TransactionAlreadyCommitted):
+            self.as_connection.abort(mrt)