CSOT tests: Expect withTransaction to propagate errors

DRIVERS-2871
mongodb · Mar 21, 2024 · 894d7ef · 894d7ef
1 parent 2c3be08
commit 894d7ef
Show file tree

Hide file tree

Showing 8 changed files with 112 additions and 12 deletions.
diff --git a/source/client-side-operations-timeout/tests/convenient-transactions.json b/source/client-side-operations-timeout/tests/convenient-transactions.json
diff --git a/source/client-side-operations-timeout/tests/convenient-transactions.yml b/source/client-side-operations-timeout/tests/convenient-transactions.yml
@@ -88,9 +88,6 @@ tests:
     expectEvents:
       - client: *client
         events:
-          # Because the second insert expects an error and gets an error, it technically succeeds, so withTransaction
-          # will try to run commitTransaction. This will fail client-side, though, because the timeout has already
-          # expired, so no command is sent.
           - commandStartedEvent:
               commandName: insert
               databaseName: *databaseName
@@ -103,3 +100,11 @@ tests:
               command:
                 insert: *collectionName
                 maxTimeMS: { $$type: ["int", "long"] }
+          - commandStartedEvent:
+              commandName: abortTransaction
+              databaseName: admin
+              command:
+                abortTransaction: 1
+                maxTimeMS: { $$type: [ "int", "long" ] }
+          - commandFailedEvent:
+              commandName: abortTransaction
diff --git a/source/client-side-operations-timeout/tests/sessions-inherit-timeoutMS.json b/source/client-side-operations-timeout/tests/sessions-inherit-timeoutMS.json
diff --git a/source/client-side-operations-timeout/tests/sessions-inherit-timeoutMS.yml b/source/client-side-operations-timeout/tests/sessions-inherit-timeoutMS.yml
@@ -153,9 +153,6 @@ tests:
     expectEvents:
       - client: *client
         events:
-          # Because the insert expects an error and gets an error, it technically succeeds, so withTransaction will
-          # try to run commitTransaction. This will fail client-side, though, because the timeout has already expired,
-          # so no command is sent.
           - commandStartedEvent:
               commandName: insert
               databaseName: *databaseName
@@ -166,3 +163,11 @@ tests:
                 maxTimeMS: { $$type: ["int", "long"] }
           - commandFailedEvent:
               commandName: insert
+          - commandStartedEvent:
+              commandName: abortTransaction
+              databaseName: admin
+              command:
+                abortTransaction: 1
+                maxTimeMS: { $$type: [ "int", "long" ] }
+          - commandFailedEvent:
+              commandName: abortTransaction
diff --git a/source/client-side-operations-timeout/tests/sessions-override-operation-timeoutMS.json b/source/client-side-operations-timeout/tests/sessions-override-operation-timeoutMS.json
diff --git a/source/client-side-operations-timeout/tests/sessions-override-operation-timeoutMS.yml b/source/client-side-operations-timeout/tests/sessions-override-operation-timeoutMS.yml
@@ -156,9 +156,6 @@ tests:
     expectEvents:
       - client: *client
         events:
-          # Because the insert expects an error and gets an error, it technically succeeds, so withTransaction will
-          # try to run commitTransaction. This will fail client-side, though, because the timeout has already expired,
-          # so no command is sent.
           - commandStartedEvent:
               commandName: insert
               databaseName: *databaseName
@@ -169,3 +166,11 @@ tests:
                 maxTimeMS: { $$type: ["int", "long"] }
           - commandFailedEvent:
               commandName: insert
+          - commandStartedEvent:
+              commandName: abortTransaction
+              databaseName: admin
+              command:
+                abortTransaction: 1
+                maxTimeMS: { $$type: ["int", "long"] }
+          - commandFailedEvent:
+              commandName: abortTransaction
diff --git a/source/client-side-operations-timeout/tests/sessions-override-timeoutMS.json b/source/client-side-operations-timeout/tests/sessions-override-timeoutMS.json
diff --git a/source/client-side-operations-timeout/tests/sessions-override-timeoutMS.yml b/source/client-side-operations-timeout/tests/sessions-override-timeoutMS.yml
@@ -153,9 +153,6 @@ tests:
     expectEvents:
       - client: *client
         events:
-          # Because the insert expects an error and gets an error, it technically succeeds, so withTransaction will
-          # try to run commitTransaction. This will fail client-side, though, because the timeout has already expired,
-          # so no command is sent.
           - commandStartedEvent:
               commandName: insert
               databaseName: *databaseName
@@ -166,3 +163,11 @@ tests:
                 maxTimeMS: { $$type: ["int", "long"] }
           - commandFailedEvent:
               commandName: insert
+          - commandStartedEvent:
+              commandName: abortTransaction
+              databaseName: admin
+              command:
+                abortTransaction: 1
+                maxTimeMS: { $$type: [ "int", "long" ] }
+          - commandFailedEvent:
+              commandName: abortTransaction