SERVER-36728 Don't ignore errors when aborting a transaction in tests

16 files changed, 30 insertions, 30 deletions

diff --git a/jstests/core/txns/abort_prepared_transaction.js b/jstests/core/txns/abort_prepared_transaction.js
index f89c7e3c686..1907d92f216 100644
--- a/jstests/core/txns/abort_prepared_transaction.js
+++ b/jstests/core/txns/abort_prepared_transaction.js
@@ -33,7 +33,7 @@
     assert.eq(doc1, sessionColl.findOne(doc1));
 
     PrepareHelpers.prepareTransaction(session);
-    session.abortTransaction();
+    session.abortTransaction_forTesting();
 
     // After abort the insert is rolled back.
     assert.eq(null, testColl.findOne(doc1));
@@ -55,7 +55,7 @@
     assert.eq(doc2, sessionColl.findOne(doc2));
 
     PrepareHelpers.prepareTransaction(session);
-    session.abortTransaction();
+    session.abortTransaction_forTesting();
 
     // After abort the update is rolled back.
     assert.eq(doc1, testColl.findOne({_id: 1}));
@@ -75,7 +75,7 @@
     assert.eq(null, sessionColl.findOne(doc2));
 
     PrepareHelpers.prepareTransaction(session);
-    session.abortTransaction();
+    session.abortTransaction_forTesting();
 
     // After abort the delete is rolled back.
     assert.eq(doc2, testColl.findOne(doc2));
diff --git a/jstests/core/txns/commit_prepared_transaction_errors.js b/jstests/core/txns/commit_prepared_transaction_errors.js
index 52d3ec35e04..654e9bc8b55 100644
--- a/jstests/core/txns/commit_prepared_transaction_errors.js
+++ b/jstests/core/txns/commit_prepared_transaction_errors.js
@@ -33,9 +33,9 @@
     assert.commandFailedWithCode(
         anotherSession.getDatabase(dbName).getCollection(collName).insert(doc),
         ErrorCodes.WriteConflict);
-    anotherSession.abortTransaction();
+    anotherSession.abortTransaction_forTesting();
     // Abort the original transaction.
-    session.abortTransaction();
+    session.abortTransaction_forTesting();
 
     jsTestLog("Test committing a prepared transaction with an invalid 'commitTimestamp'.");
     session.startTransaction();
diff --git a/jstests/core/txns/disallow_operations_on_prepared_transaction.js b/jstests/core/txns/disallow_operations_on_prepared_transaction.js
index 8888684fb46..cde9ed7ce8d 100644
--- a/jstests/core/txns/disallow_operations_on_prepared_transaction.js
+++ b/jstests/core/txns/disallow_operations_on_prepared_transaction.js
@@ -28,7 +28,7 @@
     let firstTimestamp = PrepareHelpers.prepareTransaction(session);
     let secondTimestamp = PrepareHelpers.prepareTransaction(session);
     assert.eq(firstTimestamp, secondTimestamp);
-    session.abortTransaction();
+    session.abortTransaction_forTesting();
 
     jsTestLog("Test that you can call commitTransaction on a prepared transaction.");
     session.startTransaction();
@@ -108,7 +108,7 @@
     jsTestLog("Test that you can't run update on a prepared transaction.");
     assert.commandFailedWithCode(sessionColl.update({_id: 4}, {a: 1}),
                                  ErrorCodes.PreparedTransactionInProgress);
-    session.abortTransaction();
+    session.abortTransaction_forTesting();
 
     jsTestLog("Test that you can't run getMore on a prepared transaction.");
     session.startTransaction();
@@ -124,7 +124,7 @@
     assert.commandFailedWithCode(
         sessionDB.runCommand({killCursors: collName, cursors: [res.cursor.id]}),
         ErrorCodes.PreparedTransactionInProgress);
-    session.abortTransaction();
+    session.abortTransaction_forTesting();
 
     session.endSession();
 }());
diff --git a/jstests/core/txns/empty_prepare.js b/jstests/core/txns/empty_prepare.js
index 1c8b8aa323f..9fb36a24b28 100644
--- a/jstests/core/txns/empty_prepare.js
+++ b/jstests/core/txns/empty_prepare.js
@@ -28,7 +28,7 @@
     assert.commandFailedWithCode(
         sessionDB.adminCommand({prepareTransaction: 1, coordinatorId: "dummy"}),
         ErrorCodes.OperationNotSupportedInTransaction);
-    session.abortTransaction();
+    session.abortTransaction_forTesting();
 
     // ---- Test 2. Only reads before prepare ----
 
@@ -38,7 +38,7 @@
         sessionDB.adminCommand({prepareTransaction: 1, coordinatorId: "dummy"}));
     // Makes sure prepareTransaction returns prepareTimestamp in its response.
     assert(res.hasOwnProperty("prepareTimestamp"), tojson(res));
-    session.abortTransaction();
+    session.abortTransaction_forTesting();
 
     // ---- Test 3. Noop writes before prepare ----
 
@@ -51,6 +51,6 @@
         sessionDB.adminCommand({prepareTransaction: 1, coordinatorId: "dummy"}));
     // Makes sure prepareTransaction returns prepareTimestamp in its response.
     assert(res.hasOwnProperty("prepareTimestamp"), tojson(res));
-    session.abortTransaction();
+    session.abortTransaction_forTesting();
 
 }());
diff --git a/jstests/core/txns/ensure_active_txn_for_prepare_transaction.js b/jstests/core/txns/ensure_active_txn_for_prepare_transaction.js
index 52e756f6b45..395af5c7dc6 100644
--- a/jstests/core/txns/ensure_active_txn_for_prepare_transaction.js
+++ b/jstests/core/txns/ensure_active_txn_for_prepare_transaction.js
@@ -35,7 +35,7 @@
         "Test that we can't call prepareTransaction if the most recent transaction was aborted");
     session.startTransaction();
     assert.commandWorked(sessionColl.insert({_id: 1}));
-    session.abortTransaction();
+    session.abortTransaction_forTesting();
 
     assert.commandFailedWithCode(sessionDB.adminCommand({
         prepareTransaction: 1,
diff --git a/jstests/core/txns/libs/prepare_helpers.js b/jstests/core/txns/libs/prepare_helpers.js
index f5e8b1a9598..37217d04245 100644
--- a/jstests/core/txns/libs/prepare_helpers.js
+++ b/jstests/core/txns/libs/prepare_helpers.js
@@ -42,7 +42,7 @@ const PrepareHelpers = (function() {
         if (res.ok) {
             session.commitTransaction();
         } else {
-            session.abortTransaction();
+            session.abortTransaction_forTesting();
         }
         return res;
     }
diff --git a/jstests/core/txns/multi_statement_transaction_using_api.js b/jstests/core/txns/multi_statement_transaction_using_api.js
index 1eb213d458f..ed279677a46 100644
--- a/jstests/core/txns/multi_statement_transaction_using_api.js
+++ b/jstests/core/txns/multi_statement_transaction_using_api.js
@@ -24,7 +24,7 @@
     session.startTransaction({readConcern: {level: "snapshot"}, writeConcern: {w: "majority"}});
 
     // Successfully call abortTransaction.
-    session.abortTransaction();
+    session.abortTransaction_forTesting();
 
     //
     // Test that calling commitTransaction as the first statement in a transaction is allowed and
diff --git a/jstests/core/txns/no_new_transactions_when_prepared_transaction_in_progress.js b/jstests/core/txns/no_new_transactions_when_prepared_transaction_in_progress.js
index 0da96c8d8cb..c45d561e877 100644
--- a/jstests/core/txns/no_new_transactions_when_prepared_transaction_in_progress.js
+++ b/jstests/core/txns/no_new_transactions_when_prepared_transaction_in_progress.js
@@ -54,7 +54,7 @@
     }),
                                  ErrorCodes.NoSuchTransaction);
     */
-    session.abortTransaction();
+    session.abortTransaction_forTesting();
 
     session.endSession();
 }());
diff --git a/jstests/core/txns/no_writes_to_config_transactions_with_prepared_transaction.js b/jstests/core/txns/no_writes_to_config_transactions_with_prepared_transaction.js
index b7edeade302..d9445aef260 100644
--- a/jstests/core/txns/no_writes_to_config_transactions_with_prepared_transaction.js
+++ b/jstests/core/txns/no_writes_to_config_transactions_with_prepared_transaction.js
@@ -95,7 +95,7 @@
         {abortTransaction: 1, txnNumber: NumberLong(0), stmtid: NumberInt(2), autocommit: false}));
     session.endSession();
 
-    session2.abortTransaction();
+    session2.abortTransaction_forTesting();
     session2.endSession();
 
 }());
diff --git a/jstests/core/txns/prepare_conflict.js b/jstests/core/txns/prepare_conflict.js
index f41fa802d43..ddbb41ae608 100644
--- a/jstests/core/txns/prepare_conflict.js
+++ b/jstests/core/txns/prepare_conflict.js
@@ -86,7 +86,7 @@
                        .runCommand({find: TestData.collName, filter: {_id: TestData.txnDoc._id}});
     }, db.getMongo().port);
 
-    session.abortTransaction();
+    session.abortTransaction_forTesting();
 
     // The find command should be successful.
     findAwait({checkExitSuccess: true});
diff --git a/jstests/core/txns/prepare_nonexistent_transaction.js b/jstests/core/txns/prepare_nonexistent_transaction.js
index e688f92af56..a7c268fe103 100644
--- a/jstests/core/txns/prepare_nonexistent_transaction.js
+++ b/jstests/core/txns/prepare_nonexistent_transaction.js
@@ -42,11 +42,11 @@
         autocommit: false
     }),
                                  ErrorCodes.NoSuchTransaction);
-    session.abortTransaction();
+    session.abortTransaction_forTesting();
 
     session.startTransaction();
     assert.commandWorked(sessionColl.insert(doc));
-    session.abortTransaction();
+    session.abortTransaction_forTesting();
     jsTestLog("Test that if there is no transaction active on the current session, the " +
               "'txnNumber' given matches the last known transaction for this session and the " +
               "last known transaction was aborted then it errors with 'NoSuchTransaction'.");
@@ -70,7 +70,7 @@
         autocommit: false
     }),
                                  ErrorCodes.TransactionTooOld);
-    session.abortTransaction();
+    session.abortTransaction_forTesting();
 
     jsTestLog("Test that if there is no transaction active on the current session and the " +
               "'txnNumber' given is less than the current transaction, errors with " +
diff --git a/jstests/core/txns/prepare_prepared_transaction.js b/jstests/core/txns/prepare_prepared_transaction.js
index c436d342fba..52617a9d83e 100644
--- a/jstests/core/txns/prepare_prepared_transaction.js
+++ b/jstests/core/txns/prepare_prepared_transaction.js
@@ -31,7 +31,7 @@
     const secondTimestamp = PrepareHelpers.prepareTransaction(session);
     // Both prepareTimestamps should be equal.
     assert.eq(firstTimestamp, secondTimestamp);
-    session.abortTransaction();
+    session.abortTransaction_forTesting();
 
     session.endSession();
 }());
diff --git a/jstests/core/txns/prepare_requires_fcv42.js b/jstests/core/txns/prepare_requires_fcv42.js
index 1328405701a..43db290ed83 100644
--- a/jstests/core/txns/prepare_requires_fcv42.js
+++ b/jstests/core/txns/prepare_requires_fcv42.js
@@ -39,7 +39,7 @@
             sessionDB.adminCommand({prepareTransaction: 1, coordinatorId: "dummy"}),
             ErrorCodes.CommandNotSupported);
         // Abort the transaction in the shell.
-        session.abortTransaction();
+        session.abortTransaction_forTesting();
 
     } finally {
         jsTestLog("Restore the original featureCompatibilityVersion.");
diff --git a/jstests/core/txns/shell_prompt_in_transaction.js b/jstests/core/txns/shell_prompt_in_transaction.js
index 969c824daba..01242ea586f 100644
--- a/jstests/core/txns/shell_prompt_in_transaction.js
+++ b/jstests/core/txns/shell_prompt_in_transaction.js
@@ -26,7 +26,7 @@
     assert.commandWorked(coll.insert(doc));
     assert.docEq(doc, coll.findOne());
     simulatePrompt();
-    session.abortTransaction();
+    session.abortTransaction_forTesting();
     assert.docEq(null, coll.findOne());
 
     // Start a transaction, so the session has a running transaction now.
diff --git a/jstests/core/txns/transaction_error_handling.js b/jstests/core/txns/transaction_error_handling.js
index f2436f4cf64..15c3d763330 100644
--- a/jstests/core/txns/transaction_error_handling.js
+++ b/jstests/core/txns/transaction_error_handling.js
@@ -25,7 +25,7 @@
     }
 
     try {
-        session.abortTransaction();
+        session.abortTransaction_forTesting();
     } catch (e) {
         assert.eq(e.message, "There is no active transaction to abort on this session.");
     }
@@ -59,7 +59,7 @@
     jsTestLog("Test that we cannot abort a transaction that has already been committed");
     // We cannot call abortTransaction on a transaction that has already been committed.
     try {
-        session.abortTransaction();
+        session.abortTransaction_forTesting();
     } catch (e) {
         assert.eq(e.message, "Cannot call abortTransaction after calling commitTransaction.");
     }
@@ -68,7 +68,7 @@
     // abortTransaction on a transaction that is in the 'aborted' state.
     session.startTransaction();
     assert.commandWorked(sessionColl.insert({_id: "insert-2"}));
-    session.abortTransaction();
+    session.abortTransaction_forTesting();
 
     jsTestLog("Test that we cannot commit a transaction that has already been aborted.");
     // We cannot call commitTransaction on a transaction that has already been aborted.
@@ -81,7 +81,7 @@
     jsTestLog("Test that we cannot abort a transaction that has already been aborted.");
     // We also cannot call abortTransaction on a transaction that has already been aborted.
     try {
-        session.abortTransaction();
+        session.abortTransaction_forTesting();
     } catch (e) {
         assert.eq(e.message, "Cannot call abortTransaction twice.");
     }
@@ -105,11 +105,11 @@
     session.startTransaction();
     assert.commandWorked(sessionColl.insert({_id: "insert-4"}));
     // The transaction state should be changed to 'aborted'.
-    session.abortTransaction();
+    session.abortTransaction_forTesting();
     // The transaction state should be changed to 'inactive'.
     assert.commandWorked(sessionColl.insert({_id: "normal-insert-2"}));
     try {
-        session.abortTransaction();
+        session.abortTransaction_forTesting();
     } catch (e) {
         assert.eq(e.message, "There is no active transaction to abort on this session.");
     }
diff --git a/jstests/core/txns/write_conflicts_with_non_txns.js b/jstests/core/txns/write_conflicts_with_non_txns.js
index 1ea9535b9ae..9882aeb428c 100644
--- a/jstests/core/txns/write_conflicts_with_non_txns.js
+++ b/jstests/core/txns/write_conflicts_with_non_txns.js
@@ -113,7 +113,7 @@
     // Abort the transaction, which should allow the single document write to finish and insert its
     // document successfully.
     jsTestLog("Abort the multi-document transaction.");
-    session.abortTransaction();
+    session.abortTransaction_forTesting();
     thread.join();
     assert.commandWorked(thread.returnData());