DRIVERS-1539 Cleanup open server transactions in unified unpinning tests (#1027)

Author: ShaneHarvey

source/transactions/tests/unified/mongos-unpin.json

@@ -108,6 +108,24 @@
           "arguments": {
             "session": "session0"
           }
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            },
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
         }
       ]
     },
@@ -142,7 +160,7 @@
       ]
     },
     {
-      "description": "unpin after TransientTransactionError error on abort",
+      "description": "unpin after non-transient error on abort",
       "runOnRequirements": [
         {
           "serverless": "forbid"
@@ -192,11 +210,29 @@
           "arguments": {
             "session": "session0"
           }
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            },
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
         }
       ]
     },
     {
-      "description": "unpin after non-transient error on abort",
+      "description": "unpin after TransientTransactionError error on abort",
       "operations": [
         {
           "name": "startTransaction",
@@ -241,6 +277,24 @@
           "arguments": {
             "session": "session0"
           }
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection0",
+          "arguments": {
+            "document": {
+              "x": 1
+            },
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
         }
       ]
     },

source/transactions/tests/unified/mongos-unpin.yml

@@ -70,17 +70,22 @@ tests:
         object: testRunner
         arguments:
           session: *session0
-
-  - description: unpin on successful abort
-    operations:
+      # Cleanup the potentionally open server transaction by starting and
+      # aborting a new transaction on the same session.
       - *startTransaction
       - *insertOne
       - &abortTransaction
         name: abortTransaction
         object: *session0
+
+  - description: unpin on successful abort
+    operations:
+      - *startTransaction
+      - *insertOne
+      - *abortTransaction
       - *assertNoPinnedServer
 
-  - description: unpin after TransientTransactionError error on abort
+  - description: unpin after non-transient error on abort
     runOnRequirements:
         # serverless proxy doesn't append error labels to errors in transactions
         # caused by failpoints (CLOUDP-88216)
@@ -100,8 +105,13 @@ tests:
               errorCode: *lockTimeoutErrorCode
       - *abortTransaction
       - *assertNoPinnedServer
+      # Cleanup the potentionally open server transaction by starting and
+      # aborting a new transaction on the same session.
+      - *startTransaction
+      - *insertOne
+      - *abortTransaction
 
-  - description: unpin after non-transient error on abort
+  - description: unpin after TransientTransactionError error on abort
     operations:
       - *startTransaction
       - *insertOne
@@ -117,6 +127,11 @@ tests:
               errorCode: 91 # ShutdownInProgress
       - *abortTransaction
       - *assertNoPinnedServer
+      # Cleanup the potentionally open server transaction by starting and
+      # aborting a new transaction on the same session.
+      - *startTransaction
+      - *insertOne
+      - *abortTransaction
 
   - description: unpin when a new transaction is started
     operations: