diff --git a/.mod/drivers-evergreen-tools b/.mod/drivers-evergreen-tools index 3a70ae58c8..6b328a119f 160000 --- a/.mod/drivers-evergreen-tools +++ b/.mod/drivers-evergreen-tools @@ -1 +1 @@ -Subproject commit 3a70ae58c8355b62fcfa6748557a47f4fbe45b90 +Subproject commit 6b328a119fa0ffdcd13e62b2c1c2259873a9076d diff --git a/spec/runners/crud/requirement.rb b/spec/runners/crud/requirement.rb index d8e98169b2..88b35d0c95 100644 --- a/spec/runners/crud/requirement.rb +++ b/spec/runners/crud/requirement.rb @@ -109,9 +109,9 @@ def satisfied? end end if @auth == true - ok &&= cc.auth_enabled? + ok &&= SpecConfig.instance.auth? elsif @auth == false - ok &&= !cc.auth_enabled? + ok &&= !SpecConfig.instance.auth? end if @csfle ok &&= !!(ENV['LIBMONGOCRYPT_PATH'] || ENV['FLE']) diff --git a/spec/spec_tests/data/change_streams_unified/change-streams-showExpandedEvents.yml b/spec/spec_tests/data/change_streams_unified/change-streams-showExpandedEvents.yml index fa4360c074..e6289047bf 100644 --- a/spec/spec_tests/data/change_streams_unified/change-streams-showExpandedEvents.yml +++ b/spec/spec_tests/data/change_streams_unified/change-streams-showExpandedEvents.yml @@ -2,7 +2,8 @@ description: "change-streams-showExpandedEvents" schemaVersion: "1.7" runOnRequirements: - minServerVersion: "6.0.0" - topologies: [ replicaset, sharded-replicaset, sharded ] + topologies: [ replicaset, sharded ] + serverless: forbid createEntities: - client: id: &client0 client0 @@ -160,7 +161,15 @@ tests: - name: createChangeStream object: *collection0 arguments: - pipeline: [] + pipeline: + # On sharded clusters, the create command run when loading initial + # data sometimes is still reported in the change stream. To avoid + # this, we exclude the create command when creating the change + # stream, but specifically don't exclude other events to still catch + # driver errors. + - $match: + operationType: + $ne: create showExpandedEvents: true saveResultAsEntity: &changeStream0 changeStream0 - name: createIndex @@ -259,9 +268,7 @@ tests: arguments: command: collMod: *collection0 - # Added here to fix our tests as we require a commandName but don't - # do anything with it. - commandName: modify_collection + commandName: collMod - name: iterateUntilDocumentOrError object: *changeStream0 expectResult: @@ -269,7 +276,8 @@ tests: - description: "when showExpandedEvents is true, shardCollection events are reported" runOnRequirements: - - topologies: [ sharded-replicaset, sharded ] + # Note: minServerVersion is specified in top-level runOnRequirements + - topologies: [ sharded ] operations: - name: dropCollection object: *shardedDb @@ -292,6 +300,7 @@ tests: shardCollection: shardedDb.shardedCollection key: _id: 1 + commandName: shardCollection - name: iterateUntilDocumentOrError object: *changeStream0 expectResult: diff --git a/spec/spec_tests/data/command_monitoring_unified/redacted-commands.yml b/spec/spec_tests/data/command_monitoring_unified/redacted-commands.yml index 570fb5a547..adeab99b18 100644 --- a/spec/spec_tests/data/command_monitoring_unified/redacted-commands.yml +++ b/spec/spec_tests/data/command_monitoring_unified/redacted-commands.yml @@ -93,6 +93,8 @@ tests: payload: { $$exists: false } - description: "getnonce" + runOnRequirements: + - maxServerVersion: 6.1.99 # getnonce removed as of 6.2 via SERVER-71007 operations: - name: runCommand object: *database @@ -159,6 +161,8 @@ tests: roles: { $$exists: false } - description: "copydbgetnonce" + runOnRequirements: + - maxServerVersion: 3.6.99 # copydbgetnonce was removed as of 4.0 via SERVER-32276 operations: - name: runCommand object: *database @@ -176,6 +180,8 @@ tests: command: { copydbgetnonce: { $$exists: false } } - description: "copydbsaslstart" + runOnRequirements: + - maxServerVersion: 4.0.99 # copydbsaslstart was removed as of 4.2 via SERVER-36211 operations: - name: runCommand object: *database @@ -193,6 +199,8 @@ tests: command: { copydbsaslstart: { $$exists: false } } - description: "copydb" + runOnRequirements: + - maxServerVersion: 4.0.99 # copydb was removed as of 4.2 via SERVER-36257 operations: - name: runCommand object: *database