From cb6d51f98ff6b7e770374cd2b9a761d79593629f Mon Sep 17 00:00:00 2001 From: Bailey Pearson Date: Wed, 24 Aug 2022 13:23:43 -0400 Subject: [PATCH] test(NODE-4200): sync serverless:forbid changes in change stream unified tests (#3380) --- .../unified/change-streams-errors.json | 5 +++++ .../change-streams/unified/change-streams-errors.yml | 5 +++++ .../unified/change-streams-pre_and_post_images.json | 5 +++-- .../unified/change-streams-pre_and_post_images.yml | 3 ++- .../unified/change-streams-resume-allowlist.json | 3 ++- .../unified/change-streams-resume-allowlist.yml | 4 ++++ .../unified/change-streams-resume-errorLabels.json | 3 ++- .../unified/change-streams-resume-errorLabels.yml | 4 ++++ test/spec/change-streams/unified/change-streams.json | 12 +++++++++++- test/spec/change-streams/unified/change-streams.yml | 1 + .../valid-pass/poc-change-streams.json | 7 ++++++- .../valid-pass/poc-change-streams.yml | 5 ++++- 12 files changed, 49 insertions(+), 8 deletions(-) diff --git a/test/spec/change-streams/unified/change-streams-errors.json b/test/spec/change-streams/unified/change-streams-errors.json index c0a9b3f09d..04fe8f04f3 100644 --- a/test/spec/change-streams/unified/change-streams-errors.json +++ b/test/spec/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/test/spec/change-streams/unified/change-streams-errors.yml b/test/spec/change-streams/unified/change-streams-errors.yml index e404922ca2..47ad1d07ab 100644 --- a/test/spec/change-streams/unified/change-streams-errors.yml +++ b/test/spec/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/test/spec/change-streams/unified/change-streams-pre_and_post_images.json b/test/spec/change-streams/unified/change-streams-pre_and_post_images.json index b6f0e2c3bd..8beefb2bc8 100644 --- a/test/spec/change-streams/unified/change-streams-pre_and_post_images.json +++ b/test/spec/change-streams/unified/change-streams-pre_and_post_images.json @@ -1,6 +1,6 @@ { "description": "change-streams-pre_and_post_images", - "schemaVersion": "1.0", + "schemaVersion": "1.4", "runOnRequirements": [ { "minServerVersion": "6.0.0", @@ -8,7 +8,8 @@ "replicaset", "sharded-replicaset", "load-balanced" - ] + ], + "serverless": "forbid" } ], "createEntities": [ diff --git a/test/spec/change-streams/unified/change-streams-pre_and_post_images.yml b/test/spec/change-streams/unified/change-streams-pre_and_post_images.yml index 3dc6afab74..2f6edd9820 100644 --- a/test/spec/change-streams/unified/change-streams-pre_and_post_images.yml +++ b/test/spec/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/test/spec/change-streams/unified/change-streams-resume-allowlist.json b/test/spec/change-streams/unified/change-streams-resume-allowlist.json index 167f4bb4bc..b4953ec736 100644 --- a/test/spec/change-streams/unified/change-streams-resume-allowlist.json +++ b/test/spec/change-streams/unified/change-streams-resume-allowlist.json @@ -8,7 +8,8 @@ "replicaset", "sharded-replicaset", "load-balanced" - ] + ], + "serverless": "forbid" } ], "createEntities": [ diff --git a/test/spec/change-streams/unified/change-streams-resume-allowlist.yml b/test/spec/change-streams/unified/change-streams-resume-allowlist.yml index 8b01e03ce3..5c69e23010 100644 --- a/test/spec/change-streams/unified/change-streams-resume-allowlist.yml +++ b/test/spec/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/test/spec/change-streams/unified/change-streams-resume-errorLabels.json b/test/spec/change-streams/unified/change-streams-resume-errorLabels.json index fc8772f0ed..f5f4505a9f 100644 --- a/test/spec/change-streams/unified/change-streams-resume-errorLabels.json +++ b/test/spec/change-streams/unified/change-streams-resume-errorLabels.json @@ -8,7 +8,8 @@ "replicaset", "sharded-replicaset", "load-balanced" - ] + ], + "serverless": "forbid" } ], "createEntities": [ diff --git a/test/spec/change-streams/unified/change-streams-resume-errorLabels.yml b/test/spec/change-streams/unified/change-streams-resume-errorLabels.yml index 330c2bbb04..5879b59c6a 100644 --- a/test/spec/change-streams/unified/change-streams-resume-errorLabels.yml +++ b/test/spec/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/test/spec/change-streams/unified/change-streams.json b/test/spec/change-streams/unified/change-streams.json index 599905aaaa..c8b60ed4e2 100644 --- a/test/spec/change-streams/unified/change-streams.json +++ b/test/spec/change-streams/unified/change-streams.json @@ -6,7 +6,8 @@ "minServerVersion": "3.6", "topologies": [ "replicaset" - ] + ], + "serverless": "forbid" } ], "createEntities": [ @@ -613,6 +614,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", diff --git a/test/spec/change-streams/unified/change-streams.yml b/test/spec/change-streams/unified/change-streams.yml index 3f0d14c096..3235533b5d 100644 --- a/test/spec/change-streams/unified/change-streams.yml +++ b/test/spec/change-streams/unified/change-streams.yml @@ -7,6 +7,7 @@ runOnRequirements: # 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: diff --git a/test/spec/unified-test-format/valid-pass/poc-change-streams.json b/test/spec/unified-test-format/valid-pass/poc-change-streams.json index 2a2c41a682..4194005eb4 100644 --- a/test/spec/unified-test-format/valid-pass/poc-change-streams.json +++ b/test/spec/unified-test-format/valid-pass/poc-change-streams.json @@ -1,6 +1,11 @@ { "description": "poc-change-streams", - "schemaVersion": "1.0", + "schemaVersion": "1.4", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "createEntities": [ { "client": { diff --git a/test/spec/unified-test-format/valid-pass/poc-change-streams.yml b/test/spec/unified-test-format/valid-pass/poc-change-streams.yml index df83513d27..b066cf0b89 100644 --- a/test/spec/unified-test-format/valid-pass/poc-change-streams.yml +++ b/test/spec/unified-test-format/valid-pass/poc-change-streams.yml @@ -1,6 +1,9 @@ description: "poc-change-streams" -schemaVersion: "1.0" +schemaVersion: "1.4" + +runOnRequirements: + - serverless: forbid createEntities: # Entities for creating changeStreams