RUST-1327 Restrict change stream tests to replsets (#665)

abr-egn · web-flow · commit 9258b9d370c6 · 2022-05-23T13:56:49.000-04:00
diff --git a/src/test/spec/json/change-streams/unified/change-streams-errors.json b/src/test/spec/json/change-streams/unified/change-streams-errors.json
@@ -1,6 +1,11 @@
 {
   "description": "change-streams-errors",
   "schemaVersion": "1.7",
+  "runOnRequirements": [
+    {
+      "serverless": "forbid"
+    }
+  ],
   "createEntities": [
     {
       "client": {
diff --git a/src/test/spec/json/change-streams/unified/change-streams-errors.yml b/src/test/spec/json/change-streams/unified/change-streams-errors.yml
@@ -1,5 +1,10 @@
 description: "change-streams-errors"
+
 schemaVersion: "1.7"
+
+runOnRequirements:
+  - serverless: forbid
+
 createEntities:
   - client:
       id: &client0 client0
diff --git a/src/test/spec/json/change-streams/unified/change-streams-pre_and_post_images.json b/src/test/spec/json/change-streams/unified/change-streams-pre_and_post_images.json
@@ -1,14 +1,15 @@
 {
   "description": "change-streams-pre_and_post_images",
-  "schemaVersion": "1.0",
+  "schemaVersion": "1.4",
   "runOnRequirements": [
     {
       "minServerVersion": "6.0.0",
       "topologies": [
         "replicaset",
         "sharded-replicaset",
         "load-balanced"
-      ]
+      ],
+      "serverless": "forbid"
     }
   ],
   "createEntities": [
diff --git a/src/test/spec/json/change-streams/unified/change-streams-pre_and_post_images.yml b/src/test/spec/json/change-streams/unified/change-streams-pre_and_post_images.yml
@@ -1,10 +1,11 @@
 description: "change-streams-pre_and_post_images"
 
-schemaVersion: "1.3"
+schemaVersion: "1.4"
 
 runOnRequirements:
   - minServerVersion: "6.0.0"
     topologies: [ replicaset, sharded-replicaset, load-balanced ]
+    serverless: forbid
 
 createEntities:
   - client:
diff --git a/src/test/spec/json/change-streams/unified/change-streams-resume-allowlist.json b/src/test/spec/json/change-streams/unified/change-streams-resume-allowlist.json
@@ -8,7 +8,8 @@
         "replicaset",
         "sharded-replicaset",
         "load-balanced"
-      ]
+      ],
+      "serverless": "forbid"
     }
   ],
   "createEntities": [
diff --git a/src/test/spec/json/change-streams/unified/change-streams-resume-allowlist.yml b/src/test/spec/json/change-streams/unified/change-streams-resume-allowlist.yml
@@ -1,9 +1,13 @@
 # Tests for resume behavior on server versions that do not support the ResumableChangeStreamError label
 description: "change-streams-resume-allowlist"
+
 schemaVersion: "1.7"
+
 runOnRequirements:
   - minServerVersion: "3.6"
     topologies: [ replicaset, sharded-replicaset, load-balanced ]
+    serverless: forbid
+
 createEntities:
   - client:
       id: &client0 client0
diff --git a/src/test/spec/json/change-streams/unified/change-streams-resume-errorLabels.json b/src/test/spec/json/change-streams/unified/change-streams-resume-errorLabels.json
@@ -8,7 +8,8 @@
         "replicaset",
         "sharded-replicaset",
         "load-balanced"
-      ]
+      ],
+      "serverless": "forbid"
     }
   ],
   "createEntities": [
diff --git a/src/test/spec/json/change-streams/unified/change-streams-resume-errorLabels.yml b/src/test/spec/json/change-streams/unified/change-streams-resume-errorLabels.yml
@@ -1,9 +1,13 @@
 # Tests for resume behavior on server versions that support the ResumableChangeStreamError label
 description: "change-streams-resume-errorlabels"
+
 schemaVersion: "1.7"
+
 runOnRequirements:
   - minServerVersion: "4.3.1"
     topologies: [ replicaset, sharded-replicaset, load-balanced ]
+    serverless: forbid
+
 createEntities:
   - client:
       id: &client0 client0
diff --git a/src/test/spec/json/change-streams/unified/change-streams.json b/src/test/spec/json/change-streams/unified/change-streams.json
@@ -5,9 +5,9 @@
     {
       "minServerVersion": "3.6",
       "topologies": [
-        "replicaset",
-        "sharded-replicaset"
-      ]
+        "replicaset"
+      ],
+      "serverless": "forbid"
     }
   ],
   "createEntities": [
@@ -273,6 +273,15 @@
     },
     {
       "description": "Test new structure in ns document MUST NOT err",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "3.6",
+          "maxServerVersion": "5.2.99"
+        },
+        {
+          "minServerVersion": "6.0"
+        }
+      ],
       "operations": [
         {
           "name": "createChangeStream",
@@ -449,10 +458,7 @@
       "description": "$changeStream must be the first stage in a change stream pipeline sent to the server",
       "runOnRequirements": [
         {
-          "minServerVersion": "3.6.0",
-          "topologies": [
-            "replicaset"
-          ]
+          "minServerVersion": "3.6.0"
         }
       ],
       "operations": [
@@ -525,10 +531,7 @@
       "description": "The server returns change stream responses in the specified server response format",
       "runOnRequirements": [
         {
-          "minServerVersion": "3.6.0",
-          "topologies": [
-            "replicaset"
-          ]
+          "minServerVersion": "3.6.0"
         }
       ],
       "operations": [
@@ -578,10 +581,7 @@
       "description": "Executing a watch helper on a Collection results in notifications for changes to the specified collection",
       "runOnRequirements": [
         {
-          "minServerVersion": "3.6.0",
-          "topologies": [
-            "replicaset"
-          ]
+          "minServerVersion": "3.6.0"
         }
       ],
       "operations": [
@@ -666,10 +666,7 @@
       "description": "Change Stream should allow valid aggregate pipeline stages",
       "runOnRequirements": [
         {
-          "minServerVersion": "3.6.0",
-          "topologies": [
-            "replicaset"
-          ]
+          "minServerVersion": "3.6.0"
         }
       ],
       "operations": [
@@ -756,10 +753,7 @@
       "description": "Executing a watch helper on a Database results in notifications for changes to all collections in the specified database.",
       "runOnRequirements": [
         {
-          "minServerVersion": "3.8.0",
-          "topologies": [
-            "replicaset"
-          ]
+          "minServerVersion": "3.8.0"
         }
       ],
       "operations": [
@@ -861,10 +855,7 @@
       "description": "Executing a watch helper on a MongoClient results in notifications for changes to all collections in all databases in the cluster.",
       "runOnRequirements": [
         {
-          "minServerVersion": "3.8.0",
-          "topologies": [
-            "replicaset"
-          ]
+          "minServerVersion": "3.8.0"
         }
       ],
       "operations": [
@@ -985,10 +976,7 @@
       "description": "Test insert, update, replace, and delete event types",
       "runOnRequirements": [
         {
-          "minServerVersion": "3.6.0",
-          "topologies": [
-            "replicaset"
-          ]
+          "minServerVersion": "3.6.0"
         }
       ],
       "operations": [
@@ -1140,10 +1128,7 @@
       "description": "Test rename and invalidate event types",
       "runOnRequirements": [
         {
-          "minServerVersion": "4.0.1",
-          "topologies": [
-            "replicaset"
-          ]
+          "minServerVersion": "4.0.1"
         }
       ],
       "operations": [
@@ -1220,10 +1205,7 @@
       "description": "Test drop and invalidate event types",
       "runOnRequirements": [
         {
-          "minServerVersion": "4.0.1",
-          "topologies": [
-            "replicaset"
-          ]
+          "minServerVersion": "4.0.1"
         }
       ],
       "operations": [
@@ -1289,10 +1271,7 @@
       "description": "Test consecutive resume",
       "runOnRequirements": [
         {
-          "minServerVersion": "4.1.7",
-          "topologies": [
-            "replicaset"
-          ]
+          "minServerVersion": "4.1.7"
         }
       ],
       "operations": [
diff --git a/src/test/spec/json/change-streams/unified/change-streams.yml b/src/test/spec/json/change-streams/unified/change-streams.yml
@@ -1,8 +1,14 @@
 description: "change-streams"
+
 schemaVersion: "1.7"
+
 runOnRequirements:
   - minServerVersion: "3.6"
-    topologies: [ replicaset, sharded-replicaset ]
+    # TODO(DRIVERS-2323): Run all possible tests against sharded clusters once we know the
+    # cause of unexpected command monitoring events.
+    topologies: [ replicaset ]
+    serverless: forbid
+
 createEntities:
   - client:
       id: &client0 client0
@@ -155,6 +161,10 @@ tests:
           newField: "newFieldValue"
 
   - description: "Test new structure in ns document MUST NOT err"
+    runOnRequirements:
+      - minServerVersion: "3.6"
+        maxServerVersion: "5.2.99"
+      - minServerVersion: "6.0"
     operations:
       - name: createChangeStream
         object: *collection0
@@ -238,7 +248,6 @@ tests:
   - description: $changeStream must be the first stage in a change stream pipeline sent to the server
     runOnRequirements:
       - minServerVersion: "3.6.0"
-        topologies: [ replicaset ]
     operations:
       - name: createChangeStream
         object: *collection0
@@ -275,7 +284,6 @@ tests:
   - description: The server returns change stream responses in the specified server response format
     runOnRequirements:
       - minServerVersion: "3.6.0"
-        topologies: [ replicaset ]
     operations:
       - name: createChangeStream
         object: *collection0
@@ -301,7 +309,6 @@ tests:
   - description: Executing a watch helper on a Collection results in notifications for changes to the specified collection
     runOnRequirements:
       - minServerVersion: "3.6.0"
-        topologies: [ replicaset ]
     operations:
       - name: createChangeStream
         object: *collection0
@@ -344,7 +351,6 @@ tests:
   - description: Change Stream should allow valid aggregate pipeline stages
     runOnRequirements:
       - minServerVersion: "3.6.0"
-        topologies: [ replicaset ]
     operations:
       - name: createChangeStream
         object: *collection0
@@ -389,7 +395,6 @@ tests:
   - description: Executing a watch helper on a Database results in notifications for changes to all collections in the specified database.
     runOnRequirements:
       - minServerVersion: "3.8.0"
-        topologies: [ replicaset ]
     operations:
       - name: createChangeStream
         object: *database0
@@ -442,7 +447,6 @@ tests:
   - description: Executing a watch helper on a MongoClient results in notifications for changes to all collections in all databases in the cluster.
     runOnRequirements:
       - minServerVersion: "3.8.0"
-        topologies: [ replicaset ]
     operations:
       - name: createChangeStream
         object: *client0
@@ -506,7 +510,6 @@ tests:
   - description: "Test insert, update, replace, and delete event types"
     runOnRequirements:
       - minServerVersion: "3.6.0"
-        topologies: [ replicaset ]
     operations:
       - name: createChangeStream
         object: *collection0
@@ -584,7 +587,6 @@ tests:
   - description: Test rename and invalidate event types
     runOnRequirements:
       - minServerVersion: "4.0.1"
-        topologies: [ replicaset ]
     operations:
       - name: createChangeStream
         object: *collection0
@@ -627,7 +629,6 @@ tests:
   - description: Test drop and invalidate event types
     runOnRequirements:
       - minServerVersion: "4.0.1"
-        topologies: [ replicaset ]
     operations:
       - name: createChangeStream
         object: *collection0
@@ -661,11 +662,10 @@ tests:
               databaseName: *database0
 
   # Test that resume logic works correctly even after consecutive retryable failures of a getMore command,
-  # with no intervening events.  This is ensured by setting the batch size of the change stream to 1,
+  # with no intervening events. This is ensured by setting the batch size of the change stream to 1,
   - description: Test consecutive resume
     runOnRequirements:
       - minServerVersion: "4.1.7"
-        topologies: [ replicaset ]
     operations:
       - name: failPoint
         object: testRunner

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,11 @@`
`1`	`1`	`{`
`2`	`2`	`"description": "change-streams-errors",`
`3`	`3`	`"schemaVersion": "1.7",`
	`4`	`+ "runOnRequirements": [`
	`5`	`+ {`
	`6`	`+ "serverless": "forbid"`
	`7`	`+ }`
	`8`	`+ ],`
`4`	`9`	`"createEntities": [`
`5`	`10`	`{`
`6`	`11`	`"client": {`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,15 @@`
`1`	`1`	`{`
`2`	`2`	`"description": "change-streams-pre_and_post_images",`
`3`		`- "schemaVersion": "1.0",`
	`3`	`+ "schemaVersion": "1.4",`
`4`	`4`	`"runOnRequirements": [`
`5`	`5`	`{`
`6`	`6`	`"minServerVersion": "6.0.0",`
`7`	`7`	`"topologies": [`
`8`	`8`	`"replicaset",`
`9`	`9`	`"sharded-replicaset",`
`10`	`10`	`"load-balanced"`
`11`		`- ]`
	`11`	`+ ],`
	`12`	`+ "serverless": "forbid"`
`12`	`13`	`}`
`13`	`14`	`],`
`14`	`15`	`"createEntities": [`