PYTHON-5042 Resync transaction spec tests (mongodb#2058)

ShaneHarvey · web-flow · commit 8fa6750a7e07 · 2025-01-16T12:14:25.000-08:00
diff --git a/test/transactions-convenient-api/unified/commit-retry.json b/test/transactions-convenient-api/unified/commit-retry.json
@@ -422,11 +422,6 @@
     },
     {
       "description": "commit is not retried after MaxTimeMSExpired error",
-      "runOnRequirements": [
-        {
-          "serverless": "forbid"
-        }
-      ],
       "operations": [
         {
           "name": "failPoint",
diff --git a/test/transactions-convenient-api/unified/commit-writeconcernerror.json b/test/transactions-convenient-api/unified/commit-writeconcernerror.json
@@ -1,6 +1,6 @@
 {
   "description": "commit-writeconcernerror",
-  "schemaVersion": "1.4",
+  "schemaVersion": "1.3",
   "runOnRequirements": [
     {
       "minServerVersion": "4.0",
@@ -414,11 +414,6 @@
     },
     {
       "description": "commitTransaction is not retried after UnknownReplWriteConcern error",
-      "runOnRequirements": [
-        {
-          "serverless": "forbid"
-        }
-      ],
       "operations": [
         {
           "name": "failPoint",
@@ -551,11 +546,6 @@
     },
     {
       "description": "commitTransaction is not retried after UnsatisfiableWriteConcern error",
-      "runOnRequirements": [
-        {
-          "serverless": "forbid"
-        }
-      ],
       "operations": [
         {
           "name": "failPoint",
@@ -688,11 +678,6 @@
     },
     {
       "description": "commitTransaction is not retried after MaxTimeMSExpired error",
-      "runOnRequirements": [
-        {
-          "serverless": "forbid"
-        }
-      ],
       "operations": [
         {
           "name": "failPoint",
diff --git a/test/transactions/unified/findOneAndReplace.json b/test/transactions/unified/findOneAndReplace.json
@@ -127,7 +127,9 @@
                   "update": {
                     "x": 1
                   },
-                  "new": false,
+                  "new": {
+                    "$$unsetOrMatches": false
+                  },
                   "lsid": {
                     "$$sessionLsid": "session0"
                   },
@@ -299,7 +301,9 @@
                   "update": {
                     "x": 1
                   },
-                  "new": false,
+                  "new": {
+                    "$$unsetOrMatches": false
+                  },
                   "lsid": {
                     "$$sessionLsid": "session0"
                   },
diff --git a/test/transactions/unified/findOneAndUpdate.json b/test/transactions/unified/findOneAndUpdate.json
@@ -189,7 +189,9 @@
                       "x": 1
                     }
                   },
-                  "new": false,
+                  "new": {
+                    "$$unsetOrMatches": false
+                  },
                   "lsid": {
                     "$$sessionLsid": "session0"
                   },
@@ -281,7 +283,9 @@
                       "x": 1
                     }
                   },
-                  "new": false,
+                  "new": {
+                    "$$unsetOrMatches": false
+                  },
                   "lsid": {
                     "$$sessionLsid": "session0"
                   },
@@ -340,7 +344,9 @@
                       "x": 1
                     }
                   },
-                  "new": false,
+                  "new": {
+                    "$$unsetOrMatches": false
+                  },
                   "lsid": {
                     "$$sessionLsid": "session0"
                   },
@@ -485,7 +491,9 @@
                       "x": 1
                     }
                   },
-                  "new": false,
+                  "new": {
+                    "$$unsetOrMatches": false
+                  },
                   "lsid": {
                     "$$sessionLsid": "session0"
                   },
diff --git a/test/transactions/unified/mongos-recovery-token.json b/test/transactions/unified/mongos-recovery-token.json
@@ -232,7 +232,8 @@
                   "id": "client1",
                   "useMultipleMongoses": true,
                   "uriOptions": {
-                    "heartbeatFrequencyMS": 30000
+                    "heartbeatFrequencyMS": 30000,
+                    "appName": "transactionsClient"
                   },
                   "observeEvents": [
                     "commandStartedEvent"
@@ -299,7 +300,8 @@
                   "isMaster",
                   "hello"
                 ],
-                "closeConnection": true
+                "closeConnection": true,
+                "appName": "transactionsClient"
               }
             }
           }
diff --git a/test/transactions/unified/pin-mongos.json b/test/transactions/unified/pin-mongos.json
@@ -1249,7 +1249,8 @@
                   "id": "client1",
                   "useMultipleMongoses": true,
                   "uriOptions": {
-                    "heartbeatFrequencyMS": 30000
+                    "heartbeatFrequencyMS": 30000,
+                    "appName": "transactionsClient"
                   },
                   "observeEvents": [
                     "commandStartedEvent"
@@ -1316,7 +1317,8 @@
                   "isMaster",
                   "hello"
                 ],
-                "closeConnection": true
+                "closeConnection": true,
+                "appName": "transactionsClient"
               }
             }
           }
diff --git a/test/transactions/unified/retryable-commit.json b/test/transactions/unified/retryable-commit.json
@@ -89,11 +89,6 @@
   "tests": [
     {
       "description": "commitTransaction fails after Interrupted",
-      "runOnRequirements": [
-        {
-          "serverless": "forbid"
-        }
-      ],
       "operations": [
         {
           "object": "testRunner",
diff --git a/test/transactions/unified/write-concern.json b/test/transactions/unified/write-concern.json
@@ -1417,7 +1417,9 @@
                   "update": {
                     "x": 1
                   },
-                  "new": false,
+                  "new": {
+                    "$$unsetOrMatches": false
+                  },
                   "lsid": {
                     "$$sessionLsid": "session0"
                   },
@@ -1522,7 +1524,9 @@
                       "x": 1
                     }
                   },
-                  "new": false,
+                  "new": {
+                    "$$unsetOrMatches": false
+                  },
                   "lsid": {
                     "$$sessionLsid": "session0"
                   },

Original file line number	Diff line number	Diff line change
`@@ -422,11 +422,6 @@`
`422`	`422`	`},`
`423`	`423`	`{`
`424`	`424`	`"description": "commit is not retried after MaxTimeMSExpired error",`
`425`		`- "runOnRequirements": [`
`426`		`- {`
`427`		`- "serverless": "forbid"`
`428`		`- }`
`429`		`- ],`
`430`	`425`	`"operations": [`
`431`	`426`	`{`
`432`	`427`	`"name": "failPoint",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"description": "commit-writeconcernerror",`
`3`		`- "schemaVersion": "1.4",`
	`3`	`+ "schemaVersion": "1.3",`
`4`	`4`	`"runOnRequirements": [`
`5`	`5`	`{`
`6`	`6`	`"minServerVersion": "4.0",`
`@@ -414,11 +414,6 @@`
`414`	`414`	`},`
`415`	`415`	`{`
`416`	`416`	`"description": "commitTransaction is not retried after UnknownReplWriteConcern error",`
`417`		`- "runOnRequirements": [`
`418`		`- {`
`419`		`- "serverless": "forbid"`
`420`		`- }`
`421`		`- ],`
`422`	`417`	`"operations": [`
`423`	`418`	`{`
`424`	`419`	`"name": "failPoint",`
`@@ -551,11 +546,6 @@`
`551`	`546`	`},`
`552`	`547`	`{`
`553`	`548`	`"description": "commitTransaction is not retried after UnsatisfiableWriteConcern error",`
`554`		`- "runOnRequirements": [`
`555`		`- {`
`556`		`- "serverless": "forbid"`
`557`		`- }`
`558`		`- ],`
`559`	`549`	`"operations": [`
`560`	`550`	`{`
`561`	`551`	`"name": "failPoint",`
`@@ -688,11 +678,6 @@`
`688`	`678`	`},`
`689`	`679`	`{`
`690`	`680`	`"description": "commitTransaction is not retried after MaxTimeMSExpired error",`
`691`		`- "runOnRequirements": [`
`692`		`- {`
`693`		`- "serverless": "forbid"`
`694`		`- }`
`695`		`- ],`
`696`	`681`	`"operations": [`
`697`	`682`	`{`
`698`	`683`	`"name": "failPoint",`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,8 @@`
`232`	`232`	`"id": "client1",`
`233`	`233`	`"useMultipleMongoses": true,`
`234`	`234`	`"uriOptions": {`
`235`		`- "heartbeatFrequencyMS": 30000`
	`235`	`+ "heartbeatFrequencyMS": 30000,`
	`236`	`+ "appName": "transactionsClient"`
`236`	`237`	`},`
`237`	`238`	`"observeEvents": [`
`238`	`239`	`"commandStartedEvent"`
`@@ -299,7 +300,8 @@`
`299`	`300`	`"isMaster",`
`300`	`301`	`"hello"`
`301`	`302`	`],`
`302`		`- "closeConnection": true`
	`303`	`+ "closeConnection": true,`
	`304`	`+ "appName": "transactionsClient"`
`303`	`305`	`}`
`304`	`306`	`}`
`305`	`307`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1249,7 +1249,8 @@`
`1249`	`1249`	`"id": "client1",`
`1250`	`1250`	`"useMultipleMongoses": true,`
`1251`	`1251`	`"uriOptions": {`
`1252`		`- "heartbeatFrequencyMS": 30000`
	`1252`	`+ "heartbeatFrequencyMS": 30000,`
	`1253`	`+ "appName": "transactionsClient"`
`1253`	`1254`	`},`
`1254`	`1255`	`"observeEvents": [`
`1255`	`1256`	`"commandStartedEvent"`
`@@ -1316,7 +1317,8 @@`
`1316`	`1317`	`"isMaster",`
`1317`	`1318`	`"hello"`
`1318`	`1319`	`],`
`1319`		`- "closeConnection": true`
	`1320`	`+ "closeConnection": true,`
	`1321`	`+ "appName": "transactionsClient"`
`1320`	`1322`	`}`
`1321`	`1323`	`}`
`1322`	`1324`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,11 +89,6 @@`
`89`	`89`	`"tests": [`
`90`	`90`	`{`
`91`	`91`	`"description": "commitTransaction fails after Interrupted",`
`92`		`- "runOnRequirements": [`
`93`		`- {`
`94`		`- "serverless": "forbid"`
`95`		`- }`
`96`		`- ],`
`97`	`92`	`"operations": [`
`98`	`93`	`{`
`99`	`94`	`"object": "testRunner",`