test sync

baileympearson · baileympearson · commit 2100441ad520 · 2024-10-30T15:12:49.000-06:00
diff --git a/test/spec/transactions-convenient-api/unified/commit-retry.json b/test/spec/transactions-convenient-api/unified/commit-retry.json
@@ -1,6 +1,6 @@
 {
   "description": "commit-retry",
-  "schemaVersion": "1.3",
+  "schemaVersion": "1.4",
   "runOnRequirements": [
     {
       "minServerVersion": "4.0",
@@ -422,6 +422,11 @@
     },
     {
       "description": "commit is not retried after MaxTimeMSExpired error",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "name": "failPoint",
diff --git a/test/spec/transactions-convenient-api/unified/commit-retry.yml b/test/spec/transactions-convenient-api/unified/commit-retry.yml
@@ -1,6 +1,6 @@
 description: commit-retry
 
-schemaVersion: '1.3'
+schemaVersion: '1.4'
 
 runOnRequirements:
   - minServerVersion: '4.0'
@@ -212,6 +212,9 @@ tests:
           - { _id: 1 }
   -
     description: commit is not retried after MaxTimeMSExpired error
+    runOnRequirements:
+      # Serverless sets empty `codeName` on failpoint errors. Remove once CLOUDP-280424 is fixed.
+      - serverless: forbid
     operations:
       - name: failPoint
         object: testRunner
diff --git a/test/spec/transactions-convenient-api/unified/commit-writeconcernerror.json b/test/spec/transactions-convenient-api/unified/commit-writeconcernerror.json
@@ -1,6 +1,6 @@
 {
   "description": "commit-writeconcernerror",
-  "schemaVersion": "1.3",
+  "schemaVersion": "1.4",
   "runOnRequirements": [
     {
       "minServerVersion": "4.0",
@@ -414,6 +414,11 @@
     },
     {
       "description": "commitTransaction is not retried after UnknownReplWriteConcern error",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "name": "failPoint",
@@ -546,6 +551,11 @@
     },
     {
       "description": "commitTransaction is not retried after UnsatisfiableWriteConcern error",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "name": "failPoint",
@@ -678,6 +688,11 @@
     },
     {
       "description": "commitTransaction is not retried after MaxTimeMSExpired error",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "name": "failPoint",
diff --git a/test/spec/transactions-convenient-api/unified/commit-writeconcernerror.yml b/test/spec/transactions-convenient-api/unified/commit-writeconcernerror.yml
@@ -1,6 +1,6 @@
 description: commit-writeconcernerror
 
-schemaVersion: '1.3'
+schemaVersion: '1.4' # For `serverless` in `runOnRequirements`
 
 runOnRequirements:
   - minServerVersion: '4.0'
@@ -151,6 +151,9 @@ tests:
     outcome: *outcome
   -
     description: commitTransaction is not retried after UnknownReplWriteConcern error
+    runOnRequirements:
+      # Serverless sets empty `codeName` on failpoint errors. Remove once CLOUDP-280424 is fixed.
+      - serverless: forbid
     operations:
       - name: failPoint
         object: testRunner
@@ -203,6 +206,9 @@ tests:
     outcome: *outcome
   -
     description: commitTransaction is not retried after UnsatisfiableWriteConcern error
+    runOnRequirements:
+      # Serverless sets empty `codeName` on failpoint errors. Remove once CLOUDP-280424 is fixed.
+      - serverless: forbid
     operations:
       - name: failPoint
         object: testRunner
@@ -226,6 +232,9 @@ tests:
     outcome: *outcome
   -
     description: commitTransaction is not retried after MaxTimeMSExpired error
+    runOnRequirements:
+      # Serverless sets empty `codeName` on failpoint errors. Remove once CLOUDP-280424 is fixed.
+      - serverless: forbid
     operations:
       - name: failPoint
         object: testRunner
diff --git a/test/spec/transactions/unified/retryable-commit.json b/test/spec/transactions/unified/retryable-commit.json
@@ -89,6 +89,11 @@
   "tests": [
     {
       "description": "commitTransaction fails after Interrupted",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "object": "testRunner",
diff --git a/test/spec/transactions/unified/retryable-commit.yml b/test/spec/transactions/unified/retryable-commit.yml
@@ -67,6 +67,9 @@ initialData:
 tests:
   -
     description: 'commitTransaction fails after Interrupted'
+    runOnRequirements:
+      # Serverless sets empty `codeName` on failpoint errors. Remove once CLOUDP-280424 is fixed.
+      - serverless: forbid
     operations:
       -
         object: testRunner

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"description": "commit-retry",`
`3`		`- "schemaVersion": "1.3",`
	`3`	`+ "schemaVersion": "1.4",`
`4`	`4`	`"runOnRequirements": [`
`5`	`5`	`{`
`6`	`6`	`"minServerVersion": "4.0",`
`@@ -422,6 +422,11 @@`
`422`	`422`	`},`
`423`	`423`	`{`
`424`	`424`	`"description": "commit is not retried after MaxTimeMSExpired error",`
	`425`	`+ "runOnRequirements": [`
	`426`	`+ {`
	`427`	`+ "serverless": "forbid"`
	`428`	`+ }`
	`429`	`+ ],`
`425`	`430`	`"operations": [`
`426`	`431`	`{`
`427`	`432`	`"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.3",`
	`3`	`+ "schemaVersion": "1.4",`
`4`	`4`	`"runOnRequirements": [`
`5`	`5`	`{`
`6`	`6`	`"minServerVersion": "4.0",`
`@@ -414,6 +414,11 @@`
`414`	`414`	`},`
`415`	`415`	`{`
`416`	`416`	`"description": "commitTransaction is not retried after UnknownReplWriteConcern error",`
	`417`	`+ "runOnRequirements": [`
	`418`	`+ {`
	`419`	`+ "serverless": "forbid"`
	`420`	`+ }`
	`421`	`+ ],`
`417`	`422`	`"operations": [`
`418`	`423`	`{`
`419`	`424`	`"name": "failPoint",`
`@@ -546,6 +551,11 @@`
`546`	`551`	`},`
`547`	`552`	`{`
`548`	`553`	`"description": "commitTransaction is not retried after UnsatisfiableWriteConcern error",`
	`554`	`+ "runOnRequirements": [`
	`555`	`+ {`
	`556`	`+ "serverless": "forbid"`
	`557`	`+ }`
	`558`	`+ ],`
`549`	`559`	`"operations": [`
`550`	`560`	`{`
`551`	`561`	`"name": "failPoint",`
`@@ -678,6 +688,11 @@`
`678`	`688`	`},`
`679`	`689`	`{`
`680`	`690`	`"description": "commitTransaction is not retried after MaxTimeMSExpired error",`
	`691`	`+ "runOnRequirements": [`
	`692`	`+ {`
	`693`	`+ "serverless": "forbid"`
	`694`	`+ }`
	`695`	`+ ],`
`681`	`696`	`"operations": [`
`682`	`697`	`{`
`683`	`698`	`"name": "failPoint",`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,11 @@`
`89`	`89`	`"tests": [`
`90`	`90`	`{`
`91`	`91`	`"description": "commitTransaction fails after Interrupted",`
	`92`	`+ "runOnRequirements": [`
	`93`	`+ {`
	`94`	`+ "serverless": "forbid"`
	`95`	`+ }`
	`96`	`+ ],`
`92`	`97`	`"operations": [`
`93`	`98`	`{`
`94`	`99`	`"object": "testRunner",`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,9 @@ initialData:`
`67`	`67`	`tests:`
`68`	`68`	`-`
`69`	`69`	`description: 'commitTransaction fails after Interrupted'`
	`70`	`+ runOnRequirements:`
	`71`	+ # Serverless sets empty `codeName` on failpoint errors. Remove once CLOUDP-280424 is fixed.
	`72`	`+ - serverless: forbid`
`70`	`73`	`operations:`
`71`	`74`	`-`
`72`	`75`	`object: testRunner`