RUST-2042 and RUST-2076 sync tests to fix serverless task (#1236)

kevinAlbs · web-flow · commit 9b101385795c · 2024-10-31T13:08:36.000-04:00
* RUST-2042 sync fle2v2-Rangev2-Compact to 9058491f2d5b5651913a56e373121a24d6498673 * sync tests updated in 24817a5caa0526725d480f9a8b3fbb8714507311 * RUST-2076 sync tests updated in mongodb/specifications#1680
diff --git a/src/test/spec/json/client-side-encryption/legacy/fle2v2-Rangev2-Compact.json b/src/test/spec/json/client-side-encryption/legacy/fle2v2-Rangev2-Compact.json
@@ -6,8 +6,7 @@
         "replicaset",
         "sharded",
         "load-balanced"
-      ],
-      "serverless": "forbid"
+      ]
     }
   ],
   "database_name": "default",
diff --git a/src/test/spec/json/client-side-encryption/legacy/fle2v2-Rangev2-Compact.yml b/src/test/spec/json/client-side-encryption/legacy/fle2v2-Rangev2-Compact.yml
@@ -3,7 +3,6 @@ runOn:
   - minServerVersion: "8.0.0" # Require range v2 support on server.
     # FLE 2 Encrypted collections are not supported on standalone.
     topology: [ "replicaset", "sharded", "load-balanced" ]
-    serverless: forbid # Skip on serverless until CLOUDP-267864 is resolved.
 database_name: "default"
 collection_name: &collection_name "default"
 data: []
@@ -91,4 +90,4 @@ tests:
                 }
               }
             encryptionInformation: *encryptionInformation
-          command_name: compactStructuredEncryptionData
+          command_name: compactStructuredEncryptionData
diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-replaceOne-sort.json b/src/test/spec/json/crud/unified/client-bulkWrite-replaceOne-sort.json
@@ -3,7 +3,8 @@
   "schemaVersion": "1.4",
   "runOnRequirements": [
     {
-      "minServerVersion": "8.0"
+      "minServerVersion": "8.0",
+      "serverless": "forbid"
     }
   ],
   "createEntities": [
diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-replaceOne-sort.yml b/src/test/spec/json/crud/unified/client-bulkWrite-replaceOne-sort.yml
@@ -4,6 +4,7 @@ schemaVersion: "1.4"
 
 runOnRequirements:
   - minServerVersion: "8.0"
+    serverless: forbid # Serverless does not support bulkWrite: CLOUDP-256344.
 
 createEntities:
   - client:
diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-updateOne-sort.json b/src/test/spec/json/crud/unified/client-bulkWrite-updateOne-sort.json
@@ -3,7 +3,8 @@
   "schemaVersion": "1.4",
   "runOnRequirements": [
     {
-      "minServerVersion": "8.0"
+      "minServerVersion": "8.0",
+      "serverless": "forbid"
     }
   ],
   "createEntities": [
diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-updateOne-sort.yml b/src/test/spec/json/crud/unified/client-bulkWrite-updateOne-sort.yml
@@ -4,6 +4,7 @@ schemaVersion: "1.4"
 
 runOnRequirements:
   - minServerVersion: "8.0"
+    serverless: forbid # Serverless does not support bulkWrite: CLOUDP-256344.
 
 createEntities:
   - client:
diff --git a/src/test/spec/json/transactions-convenient-api/unified/commit-retry.json b/src/test/spec/json/transactions-convenient-api/unified/commit-retry.json
@@ -422,6 +422,11 @@
     },
     {
       "description": "commit is not retried after MaxTimeMSExpired error",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "name": "failPoint",
diff --git a/src/test/spec/json/transactions-convenient-api/unified/commit-retry.yml b/src/test/spec/json/transactions-convenient-api/unified/commit-retry.yml
@@ -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/src/test/spec/json/transactions-convenient-api/unified/commit-writeconcernerror.json b/src/test/spec/json/transactions-convenient-api/unified/commit-writeconcernerror.json
@@ -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/src/test/spec/json/transactions-convenient-api/unified/commit-writeconcernerror.yml b/src/test/spec/json/transactions-convenient-api/unified/commit-writeconcernerror.yml
@@ -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/src/test/spec/json/transactions/unified/retryable-commit.json b/src/test/spec/json/transactions/unified/retryable-commit.json
@@ -89,6 +89,11 @@
   "tests": [
     {
       "description": "commitTransaction fails after Interrupted",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "object": "testRunner",
diff --git a/src/test/spec/json/transactions/unified/retryable-commit.yml b/src/test/spec/json/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
`@@ -3,7 +3,6 @@ runOn:`
`3`	`3`	`- minServerVersion: "8.0.0" # Require range v2 support on server.`
`4`	`4`	`# FLE 2 Encrypted collections are not supported on standalone.`
`5`	`5`	`topology: [ "replicaset", "sharded", "load-balanced" ]`
`6`		`- serverless: forbid # Skip on serverless until CLOUDP-267864 is resolved.`
`7`	`6`	`database_name: "default"`
`8`	`7`	`collection_name: &collection_name "default"`
`9`	`8`	`data: []`
`@@ -91,4 +90,4 @@ tests:`
`91`	`90`	`}`
`92`	`91`	`}`
`93`	`92`	`encryptionInformation: *encryptionInformation`
`94`		`- command_name: compactStructuredEncryptionData`
	`93`	`+ command_name: compactStructuredEncryptionData`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,8 @@`
`3`	`3`	`"schemaVersion": "1.4",`
`4`	`4`	`"runOnRequirements": [`
`5`	`5`	`{`
`6`		`- "minServerVersion": "8.0"`
	`6`	`+ "minServerVersion": "8.0",`
	`7`	`+ "serverless": "forbid"`
`7`	`8`	`}`
`8`	`9`	`],`
`9`	`10`	`"createEntities": [`
Original file line number	Diff line number	Diff line change
`@@ -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
`@@ -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`