test: sync latest spec tests

nbbeeken · nbbeeken · commit ddb9aa7d15aa · 2024-08-13T10:26:58.000-04:00
diff --git a/test/integration/client-side-operations-timeout/client_side_operations_timeout.spec.test.ts b/test/integration/client-side-operations-timeout/client_side_operations_timeout.spec.test.ts
@@ -8,7 +8,10 @@ const enabled = [
   'override-database-timeoutMS',
   'override-operation-timeoutMS',
   'retryability-legacy-timeouts',
-  'retryability-timeoutMS'
+  'retryability-timeoutMS',
+  'sessions-override-operation-timeoutMS',
+  'sessions-override-timeoutMS',
+  'sessions-inherit-timeoutMS'
 ];
 
 const cursorOperations = [
diff --git a/test/spec/client-side-operations-timeout/sessions-inherit-timeoutMS.json b/test/spec/client-side-operations-timeout/sessions-inherit-timeoutMS.json
@@ -21,7 +21,7 @@
       "client": {
         "id": "client",
         "uriOptions": {
-          "timeoutMS": 50
+          "timeoutMS": 500
         },
         "useMultipleMongoses": false,
         "observeEvents": [
@@ -78,7 +78,7 @@
                   "commitTransaction"
                 ],
                 "blockConnection": true,
-                "blockTimeMS": 60
+                "blockTimeMS": 600
               }
             }
           }
@@ -165,7 +165,7 @@
                   "abortTransaction"
                 ],
                 "blockConnection": true,
-                "blockTimeMS": 60
+                "blockTimeMS": 600
               }
             }
           }
@@ -249,7 +249,7 @@
                   "insert"
                 ],
                 "blockConnection": true,
-                "blockTimeMS": 60
+                "blockTimeMS": 600
               }
             }
           }
@@ -302,6 +302,26 @@
               "commandFailedEvent": {
                 "commandName": "insert"
               }
+            },
+            {
+              "commandStartedEvent": {
+                "commandName": "abortTransaction",
+                "databaseName": "admin",
+                "command": {
+                  "abortTransaction": 1,
+                  "maxTimeMS": {
+                    "$$type": [
+                      "int",
+                      "long"
+                    ]
+                  }
+                }
+              }
+            },
+            {
+              "commandFailedEvent": {
+                "commandName": "abortTransaction"
+              }
             }
           ]
         }
diff --git a/test/spec/client-side-operations-timeout/sessions-inherit-timeoutMS.yml b/test/spec/client-side-operations-timeout/sessions-inherit-timeoutMS.yml
@@ -13,7 +13,7 @@ createEntities:
   - client:
       id: &client client
       uriOptions:
-        timeoutMS: 50
+        timeoutMS: 500
       useMultipleMongoses: false
       observeEvents:
         - commandStartedEvent
@@ -52,7 +52,7 @@ tests:
             data:
               failCommands: ["commitTransaction"]
               blockConnection: true
-              blockTimeMS: 60
+              blockTimeMS: 600
       - name: startTransaction
         object: *session
       - name: insertOne
@@ -95,7 +95,7 @@ tests:
             data:
               failCommands: ["abortTransaction"]
               blockConnection: true
-              blockTimeMS: 60
+              blockTimeMS: 600
       - name: startTransaction
         object: *session
       - name: insertOne
@@ -136,7 +136,7 @@ tests:
             data:
               failCommands: ["insert"]
               blockConnection: true
-              blockTimeMS: 60
+              blockTimeMS: 600
       - name: withTransaction
         object: *session
         arguments:
@@ -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/test/spec/client-side-operations-timeout/sessions-override-operation-timeoutMS.json b/test/spec/client-side-operations-timeout/sessions-override-operation-timeoutMS.json
@@ -75,7 +75,7 @@
                   "commitTransaction"
                 ],
                 "blockConnection": true,
-                "blockTimeMS": 60
+                "blockTimeMS": 600
               }
             }
           }
@@ -98,7 +98,7 @@
           "name": "commitTransaction",
           "object": "session",
           "arguments": {
-            "timeoutMS": 50
+            "timeoutMS": 500
           },
           "expectError": {
             "isTimeoutError": true
@@ -165,7 +165,7 @@
                   "abortTransaction"
                 ],
                 "blockConnection": true,
-                "blockTimeMS": 60
+                "blockTimeMS": 600
               }
             }
           }
@@ -188,7 +188,7 @@
           "name": "abortTransaction",
           "object": "session",
           "arguments": {
-            "timeoutMS": 50
+            "timeoutMS": 500
           }
         }
       ],
@@ -252,7 +252,7 @@
                   "insert"
                 ],
                 "blockConnection": true,
-                "blockTimeMS": 60
+                "blockTimeMS": 600
               }
             }
           }
@@ -261,7 +261,7 @@
           "name": "withTransaction",
           "object": "session",
           "arguments": {
-            "timeoutMS": 50,
+            "timeoutMS": 500,
             "callback": [
               {
                 "name": "insertOne",
@@ -306,6 +306,26 @@
               "commandFailedEvent": {
                 "commandName": "insert"
               }
+            },
+            {
+              "commandStartedEvent": {
+                "commandName": "abortTransaction",
+                "databaseName": "admin",
+                "command": {
+                  "abortTransaction": 1,
+                  "maxTimeMS": {
+                    "$$type": [
+                      "int",
+                      "long"
+                    ]
+                  }
+                }
+              }
+            },
+            {
+              "commandFailedEvent": {
+                "commandName": "abortTransaction"
+              }
             }
           ]
         }
diff --git a/test/spec/client-side-operations-timeout/sessions-override-operation-timeoutMS.yml b/test/spec/client-side-operations-timeout/sessions-override-operation-timeoutMS.yml
@@ -50,7 +50,7 @@ tests:
             data:
               failCommands: ["commitTransaction"]
               blockConnection: true
-              blockTimeMS: 60
+              blockTimeMS: 600
       - name: startTransaction
         object: *session
       - name: insertOne
@@ -61,7 +61,7 @@ tests:
       - name: commitTransaction
         object: *session
         arguments:
-          timeoutMS: 50
+          timeoutMS: 500
         expectError:
           isTimeoutError: true
     expectEvents:
@@ -95,7 +95,7 @@ tests:
             data:
               failCommands: ["abortTransaction"]
               blockConnection: true
-              blockTimeMS: 60
+              blockTimeMS: 600
       - name: startTransaction
         object: *session
       - name: insertOne
@@ -106,7 +106,7 @@ tests:
       - name: abortTransaction
         object: *session
         arguments:
-          timeoutMS: 50
+          timeoutMS: 500
     expectEvents:
       - client: *client
         events:
@@ -138,11 +138,11 @@ tests:
             data:
               failCommands: ["insert"]
               blockConnection: true
-              blockTimeMS: 60
+              blockTimeMS: 600
       - name: withTransaction
         object: *session
         arguments:
-          timeoutMS: 50
+          timeoutMS: 500
           callback:
             - name: insertOne
               object: *collection
@@ -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/test/spec/client-side-operations-timeout/sessions-override-timeoutMS.json b/test/spec/client-side-operations-timeout/sessions-override-timeoutMS.json
@@ -47,7 +47,7 @@
         "id": "session",
         "client": "client",
         "sessionOptions": {
-          "defaultTimeoutMS": 50
+          "defaultTimeoutMS": 500
         }
       }
     }
@@ -78,7 +78,7 @@
                   "commitTransaction"
                 ],
                 "blockConnection": true,
-                "blockTimeMS": 60
+                "blockTimeMS": 600
               }
             }
           }
@@ -165,7 +165,7 @@
                   "abortTransaction"
                 ],
                 "blockConnection": true,
-                "blockTimeMS": 60
+                "blockTimeMS": 600
               }
             }
           }
@@ -249,7 +249,7 @@
                   "insert"
                 ],
                 "blockConnection": true,
-                "blockTimeMS": 60
+                "blockTimeMS": 600
               }
             }
           }
@@ -302,6 +302,26 @@
               "commandFailedEvent": {
                 "commandName": "insert"
               }
+            },
+            {
+              "commandStartedEvent": {
+                "commandName": "abortTransaction",
+                "databaseName": "admin",
+                "command": {
+                  "abortTransaction": 1,
+                  "maxTimeMS": {
+                    "$$type": [
+                      "int",
+                      "long"
+                    ]
+                  }
+                }
+              }
+            },
+            {
+              "commandFailedEvent": {
+                "commandName": "abortTransaction"
+              }
             }
           ]
         }
diff --git a/test/spec/client-side-operations-timeout/sessions-override-timeoutMS.yml b/test/spec/client-side-operations-timeout/sessions-override-timeoutMS.yml

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`"client": {`
`22`	`22`	`"id": "client",`
`23`	`23`	`"uriOptions": {`
`24`		`- "timeoutMS": 50`
	`24`	`+ "timeoutMS": 500`
`25`	`25`	`},`
`26`	`26`	`"useMultipleMongoses": false,`
`27`	`27`	`"observeEvents": [`
`@@ -78,7 +78,7 @@`
`78`	`78`	`"commitTransaction"`
`79`	`79`	`],`
`80`	`80`	`"blockConnection": true,`
`81`		`- "blockTimeMS": 60`
	`81`	`+ "blockTimeMS": 600`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`	`}`
`@@ -165,7 +165,7 @@`
`165`	`165`	`"abortTransaction"`
`166`	`166`	`],`
`167`	`167`	`"blockConnection": true,`
`168`		`- "blockTimeMS": 60`
	`168`	`+ "blockTimeMS": 600`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`	`}`
`@@ -249,7 +249,7 @@`
`249`	`249`	`"insert"`
`250`	`250`	`],`
`251`	`251`	`"blockConnection": true,`
`252`		`- "blockTimeMS": 60`
	`252`	`+ "blockTimeMS": 600`
`253`	`253`	`}`
`254`	`254`	`}`
`255`	`255`	`}`
`@@ -302,6 +302,26 @@`
`302`	`302`	`"commandFailedEvent": {`
`303`	`303`	`"commandName": "insert"`
`304`	`304`	`}`
	`305`	`+ },`
	`306`	`+ {`
	`307`	`+ "commandStartedEvent": {`
	`308`	`+ "commandName": "abortTransaction",`
	`309`	`+ "databaseName": "admin",`
	`310`	`+ "command": {`
	`311`	`+ "abortTransaction": 1,`
	`312`	`+ "maxTimeMS": {`
	`313`	`+ "$$type": [`
	`314`	`+ "int",`
	`315`	`+ "long"`
	`316`	`+ ]`
	`317`	`+ }`
	`318`	`+ }`
	`319`	`+ }`
	`320`	`+ },`
	`321`	`+ {`
	`322`	`+ "commandFailedEvent": {`
	`323`	`+ "commandName": "abortTransaction"`
	`324`	`+ }`
`305`	`325`	`}`
`306`	`326`	`]`
`307`	`327`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@`
`75`	`75`	`"commitTransaction"`
`76`	`76`	`],`
`77`	`77`	`"blockConnection": true,`
`78`		`- "blockTimeMS": 60`
	`78`	`+ "blockTimeMS": 600`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`	`}`
`@@ -98,7 +98,7 @@`
`98`	`98`	`"name": "commitTransaction",`
`99`	`99`	`"object": "session",`
`100`	`100`	`"arguments": {`
`101`		`- "timeoutMS": 50`
	`101`	`+ "timeoutMS": 500`
`102`	`102`	`},`
`103`	`103`	`"expectError": {`
`104`	`104`	`"isTimeoutError": true`
`@@ -165,7 +165,7 @@`
`165`	`165`	`"abortTransaction"`
`166`	`166`	`],`
`167`	`167`	`"blockConnection": true,`
`168`		`- "blockTimeMS": 60`
	`168`	`+ "blockTimeMS": 600`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`	`}`
`@@ -188,7 +188,7 @@`
`188`	`188`	`"name": "abortTransaction",`
`189`	`189`	`"object": "session",`
`190`	`190`	`"arguments": {`
`191`		`- "timeoutMS": 50`
	`191`	`+ "timeoutMS": 500`
`192`	`192`	`}`
`193`	`193`	`}`
`194`	`194`	`],`
`@@ -252,7 +252,7 @@`
`252`	`252`	`"insert"`
`253`	`253`	`],`
`254`	`254`	`"blockConnection": true,`
`255`		`- "blockTimeMS": 60`
	`255`	`+ "blockTimeMS": 600`
`256`	`256`	`}`
`257`	`257`	`}`
`258`	`258`	`}`
`@@ -261,7 +261,7 @@`
`261`	`261`	`"name": "withTransaction",`
`262`	`262`	`"object": "session",`
`263`	`263`	`"arguments": {`
`264`		`- "timeoutMS": 50,`
	`264`	`+ "timeoutMS": 500,`
`265`	`265`	`"callback": [`
`266`	`266`	`{`
`267`	`267`	`"name": "insertOne",`
`@@ -306,6 +306,26 @@`
`306`	`306`	`"commandFailedEvent": {`
`307`	`307`	`"commandName": "insert"`
`308`	`308`	`}`
	`309`	`+ },`
	`310`	`+ {`
	`311`	`+ "commandStartedEvent": {`
	`312`	`+ "commandName": "abortTransaction",`
	`313`	`+ "databaseName": "admin",`
	`314`	`+ "command": {`
	`315`	`+ "abortTransaction": 1,`
	`316`	`+ "maxTimeMS": {`
	`317`	`+ "$$type": [`
	`318`	`+ "int",`
	`319`	`+ "long"`
	`320`	`+ ]`
	`321`	`+ }`
	`322`	`+ }`
	`323`	`+ }`
	`324`	`+ },`
	`325`	`+ {`
	`326`	`+ "commandFailedEvent": {`
	`327`	`+ "commandName": "abortTransaction"`
	`328`	`+ }`
`309`	`329`	`}`
`310`	`330`	`]`
`311`	`331`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`	`"id": "session",`
`48`	`48`	`"client": "client",`
`49`	`49`	`"sessionOptions": {`
`50`		`- "defaultTimeoutMS": 50`
	`50`	`+ "defaultTimeoutMS": 500`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`}`
`@@ -78,7 +78,7 @@`
`78`	`78`	`"commitTransaction"`
`79`	`79`	`],`
`80`	`80`	`"blockConnection": true,`
`81`		`- "blockTimeMS": 60`
	`81`	`+ "blockTimeMS": 600`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`	`}`
`@@ -165,7 +165,7 @@`
`165`	`165`	`"abortTransaction"`
`166`	`166`	`],`
`167`	`167`	`"blockConnection": true,`
`168`		`- "blockTimeMS": 60`
	`168`	`+ "blockTimeMS": 600`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`	`}`
`@@ -249,7 +249,7 @@`
`249`	`249`	`"insert"`
`250`	`250`	`],`
`251`	`251`	`"blockConnection": true,`
`252`		`- "blockTimeMS": 60`
	`252`	`+ "blockTimeMS": 600`
`253`	`253`	`}`
`254`	`254`	`}`
`255`	`255`	`}`
`@@ -302,6 +302,26 @@`
`302`	`302`	`"commandFailedEvent": {`
`303`	`303`	`"commandName": "insert"`
`304`	`304`	`}`
	`305`	`+ },`
	`306`	`+ {`
	`307`	`+ "commandStartedEvent": {`
	`308`	`+ "commandName": "abortTransaction",`
	`309`	`+ "databaseName": "admin",`
	`310`	`+ "command": {`
	`311`	`+ "abortTransaction": 1,`
	`312`	`+ "maxTimeMS": {`
	`313`	`+ "$$type": [`
	`314`	`+ "int",`
	`315`	`+ "long"`
	`316`	`+ ]`
	`317`	`+ }`
	`318`	`+ }`
	`319`	`+ }`
	`320`	`+ },`
	`321`	`+ {`
	`322`	`+ "commandFailedEvent": {`
	`323`	`+ "commandName": "abortTransaction"`
	`324`	`+ }`
`305`	`325`	`}`
`306`	`326`	`]`
`307`	`327`	`}`