diff --git a/test/integration/client-side-encryption/client_side_encryption.prose.22.range_explicit_encryption.test.ts b/test/integration/client-side-encryption/client_side_encryption.prose.22.range_explicit_encryption.test.ts index af5fbf9fe1..ae4d82372c 100644 --- a/test/integration/client-side-encryption/client_side_encryption.prose.22.range_explicit_encryption.test.ts +++ b/test/integration/client-side-encryption/client_side_encryption.prose.22.range_explicit_encryption.test.ts @@ -2,6 +2,7 @@ import { EJSON } from 'bson'; import { expect } from 'chai'; import { readFile } from 'fs/promises'; import { join } from 'path'; +import * as semver from 'semver'; import { Decimal128, type Document, Double, Long, type MongoClient } from '../../../src'; /* eslint-disable @typescript-eslint/no-restricted-imports */ @@ -126,6 +127,14 @@ const readEncryptedFieldsFile = (dataType: string): Promise => describe('Range Explicit Encryption', function () { installNodeDNSWorkaroundHooks(); + beforeEach(async function () { + if (semver.gte(this.configuration.version, '7.999.999')) { + if (this.currentTest) + this.currentTest.skipReason = 'TODO(NODE-5908): skip rangePreview tests on server 8.0+'; + return this.currentTest?.skip(); + } + }); + let clientEncryption; let keyId; let keyVaultClient; diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-MissingKey.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-MissingKey.json index 8812a1f0a6..1e655f0a9c 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-MissingKey.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-MissingKey.json @@ -54,7 +54,7 @@ "key_vault_data": [], "tests": [ { - "description": "FLE2 encrypt fails with mising key", + "description": "FLE2 encrypt fails with missing key", "clientOptions": { "autoEncryptOpts": { "kmsProviders": { @@ -85,7 +85,7 @@ ] }, { - "description": "FLE2 decrypt fails with mising key", + "description": "FLE2 decrypt fails with missing key", "clientOptions": { "autoEncryptOpts": { "kmsProviders": { diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-MissingKey.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-MissingKey.yml index 2d9eb6e580..f4fbbeb5ca 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-MissingKey.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-MissingKey.yml @@ -19,7 +19,7 @@ data: [ encrypted_fields: {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} key_vault_data: [] tests: - - description: "FLE2 encrypt fails with mising key" + - description: "FLE2 encrypt fails with missing key" clientOptions: autoEncryptOpts: kmsProviders: @@ -30,7 +30,7 @@ tests: document: { _id: 1, encryptedIndexed: "123" } result: errorContains: "not all keys requested were satisfied" - - description: "FLE2 decrypt fails with mising key" + - description: "FLE2 decrypt fails with missing key" clientOptions: autoEncryptOpts: kmsProviders: diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.json index ba53b007b5..9eaabe0d71 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.yml index 93ad199511..c0f6179445 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.json index e9620efbed..fa887e0892 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.yml index d60b7b6201..49f66ae285 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.yml @@ -7,6 +7,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.json index daaa093896..cce4faf188 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.yml index 0b969fd48c..689d93a716 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.json index 8500fa8291..4392b67686 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.yml index 76bfe7ea25..69418e441c 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.json index 7de45ba00e..27ce7881df 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.yml index e978b9de59..9ad57efa71 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.json index d5b62be062..f7d5a6af66 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.yml index fe7d050f1b..2dd35dfaa6 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Aggregate.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Aggregate.json index 081bc577fb..401ee34e3f 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Aggregate.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Aggregate.json @@ -4,7 +4,8 @@ "minServerVersion": "7.0.0", "topology": [ "replicaset" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Aggregate.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Aggregate.yml index 0926988d27..4debfefc80 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Aggregate.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Aggregate.yml @@ -6,6 +6,8 @@ runOn: # FLE 2 Encrypted collections are not supported on standalone. # Tests for Decimal (without precision) must only run against a replica set. Decimal (without precision) queries are expected to take a long time and may exceed the default mongos timeout. topology: [ "replicaset" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Correctness.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Correctness.json index 12fe7c8bc8..758d3e5732 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Correctness.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Correctness.json @@ -4,7 +4,8 @@ "minServerVersion": "7.0.0", "topology": [ "replicaset" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Correctness.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Correctness.yml index 1961ed3e5f..4eef897c4a 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Correctness.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Correctness.yml @@ -8,6 +8,8 @@ runOn: # FLE 2 Encrypted collections are not supported on standalone. # Tests for Decimal (without precision) must only run against a replica set. Decimal (without precision) queries are expected to take a long time and may exceed the default mongos timeout. topology: [ "replicaset" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Delete.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Delete.json index ac49d16a20..24a08f318c 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Delete.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Delete.json @@ -4,7 +4,8 @@ "minServerVersion": "7.0.0", "topology": [ "replicaset" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Delete.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Delete.yml index bdb10e2d88..aad79c5459 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Delete.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Delete.yml @@ -6,6 +6,8 @@ runOn: # FLE 2 Encrypted collections are not supported on standalone. # Tests for Decimal (without precision) must only run against a replica set. Decimal (without precision) queries are expected to take a long time and may exceed the default mongos timeout. topology: [ "replicaset" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.json index 88a2350786..2a8070ecf9 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.json @@ -4,7 +4,8 @@ "minServerVersion": "7.0.0", "topology": [ "replicaset" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.yml index defccea0aa..d71ba28c5b 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.yml @@ -6,6 +6,8 @@ runOn: # FLE 2 Encrypted collections are not supported on standalone. # Tests for Decimal (without precision) must only run against a replica set. Decimal (without precision) queries are expected to take a long time and may exceed the default mongos timeout. topology: [ "replicaset" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-InsertFind.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-InsertFind.json index 54e43e4a26..2ef63f42b9 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-InsertFind.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-InsertFind.json @@ -4,7 +4,8 @@ "minServerVersion": "7.0.0", "topology": [ "replicaset" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-InsertFind.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-InsertFind.yml index 51abaa6423..9e70ff9728 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-InsertFind.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-InsertFind.yml @@ -6,6 +6,8 @@ runOn: # FLE 2 Encrypted collections are not supported on standalone. # Tests for Decimal (without precision) must only run against a replica set. Decimal (without precision) queries are expected to take a long time and may exceed the default mongos timeout. topology: [ "replicaset" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Update.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Update.json index b2b8136a9a..8064eb1b18 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Update.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Update.json @@ -4,7 +4,8 @@ "minServerVersion": "7.0.0", "topology": [ "replicaset" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Update.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Update.yml index e79fd082ec..f06c13a4eb 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Update.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Update.yml @@ -6,6 +6,8 @@ runOn: # FLE 2 Encrypted collections are not supported on standalone. # Tests for Decimal (without precision) must only run against a replica set. Decimal (without precision) queries are expected to take a long time and may exceed the default mongos timeout. topology: [ "replicaset" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Aggregate.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Aggregate.json index b078d18172..8cf143c094 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Aggregate.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Aggregate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Aggregate.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Aggregate.yml index 08f4a380cf..43f1df6864 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Aggregate.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Aggregate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Correctness.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Correctness.json index 0859e702aa..a4b06998f7 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Correctness.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Correctness.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Correctness.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Correctness.yml index 18252b4bbe..c4b037bde8 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Correctness.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Correctness.yml @@ -7,6 +7,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Delete.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Delete.json index 6e1ad90cd4..fad8234838 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Delete.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Delete.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Delete.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Delete.yml index ade385d202..cb10767df1 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Delete.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Delete.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.json index 1cfd19a1e8..fb8f4f4140 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.yml index 7100d58886..2c67b36381 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-InsertFind.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-InsertFind.json index da76609727..79562802e6 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-InsertFind.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-InsertFind.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-InsertFind.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-InsertFind.yml index 32785d6589..f01401718d 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-InsertFind.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-InsertFind.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Update.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Update.json index 2d201948cf..cc93b76948 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Update.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Update.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Update.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Update.yml index eedd076084..22beb93e94 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Update.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Update.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Aggregate.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Aggregate.json index c188f1f5a9..79f26660f2 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Aggregate.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Aggregate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Aggregate.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Aggregate.yml index 4fb95343b0..83ca7fb90f 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Aggregate.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Aggregate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Correctness.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Correctness.json index 3e298127dd..117e56af62 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Correctness.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Correctness.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Correctness.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Correctness.yml index 7289bb24dc..5f91aead18 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Correctness.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Correctness.yml @@ -7,6 +7,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Delete.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Delete.json index dc0ba435f0..40d8ed5bb2 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Delete.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Delete.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Delete.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Delete.yml index 2f42c1da10..def2bcb67b 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Delete.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Delete.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-FindOneAndUpdate.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-FindOneAndUpdate.json index 4b96575e18..f0893ce661 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-FindOneAndUpdate.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-FindOneAndUpdate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-FindOneAndUpdate.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-FindOneAndUpdate.yml index d6573ff862..4bac3c1382 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-FindOneAndUpdate.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-FindOneAndUpdate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-InsertFind.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-InsertFind.json index 4827b6838f..d3dc2f830c 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-InsertFind.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-InsertFind.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-InsertFind.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-InsertFind.yml index 0122ba243c..33b531f839 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-InsertFind.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-InsertFind.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Update.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Update.json index c3284ad0ff..9d6a1fbfdd 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Update.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Update.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Update.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Update.yml index 176db3971e..65f50aecd4 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Update.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Double-Update.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Aggregate.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Aggregate.json index a2c1f3b75d..4188685a2c 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Aggregate.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Aggregate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Aggregate.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Aggregate.yml index 134003bf9c..4c3b3d66bc 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Aggregate.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Aggregate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Correctness.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Correctness.json index d0c0601ce8..60f1ea7a33 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Correctness.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Correctness.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Correctness.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Correctness.yml index a8fc4ec2a4..6f3259f324 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Correctness.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Correctness.yml @@ -7,6 +7,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Delete.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Delete.json index a617442ee0..4ed591d3f8 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Delete.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Delete.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Delete.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Delete.yml index a6f83da786..fa04447534 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Delete.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Delete.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.json index 5565fb179e..d8fbbfae73 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.yml index 5def8d287d..0f615d4b5e 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-InsertFind.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-InsertFind.json index a1d8c17855..4213b066d1 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-InsertFind.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-InsertFind.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-InsertFind.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-InsertFind.yml index 8900f79a86..107151449d 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-InsertFind.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-InsertFind.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Update.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Update.json index 6ea99242b1..89eb4c338d 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Update.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Update.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Update.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Update.yml index 3e31f40181..b8ffbe9d4d 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Update.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Update.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Aggregate.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Aggregate.json index b3b2826faf..686f0241ba 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Aggregate.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Aggregate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Aggregate.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Aggregate.yml index 13c350ea5f..052a3006e4 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Aggregate.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Aggregate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Correctness.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Correctness.json index 4932223ba2..2964624f22 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Correctness.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Correctness.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Correctness.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Correctness.yml index 1e7d5d47fc..f7e4c53dec 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Correctness.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Correctness.yml @@ -7,6 +7,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Delete.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Delete.json index 03f816e4b2..531b3e7590 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Delete.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Delete.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Delete.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Delete.yml index ab1e9d2e5e..ecc5eaa279 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Delete.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Delete.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-FindOneAndUpdate.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-FindOneAndUpdate.json index d573f7b6a0..402086cdb6 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-FindOneAndUpdate.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-FindOneAndUpdate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-FindOneAndUpdate.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-FindOneAndUpdate.yml index a33a5120a5..9e878890fb 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-FindOneAndUpdate.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-FindOneAndUpdate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-InsertFind.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-InsertFind.json index 04953663fe..965b8a5516 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-InsertFind.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-InsertFind.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-InsertFind.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-InsertFind.yml index 4ef8c8e520..6e9594a1b6 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-InsertFind.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-InsertFind.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Update.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Update.json index 4c7a3c2789..6cf44ac782 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Update.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Update.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Update.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Update.yml index cf5716dab0..a98c1a659f 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Update.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Int-Update.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Aggregate.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Aggregate.json index a7e77fd5c3..6edb38a800 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Aggregate.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Aggregate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Aggregate.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Aggregate.yml index cb5e42c158..5bc598daa5 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Aggregate.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Aggregate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Correctness.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Correctness.json index 365822c79c..3d33f7381b 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Correctness.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Correctness.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Correctness.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Correctness.yml index a7a33e274e..01834f1c3b 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Correctness.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Correctness.yml @@ -7,6 +7,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Delete.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Delete.json index 17a01fe076..1b32782010 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Delete.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Delete.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Delete.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Delete.yml index 8dd1603f33..617794a174 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Delete.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Delete.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-FindOneAndUpdate.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-FindOneAndUpdate.json index 918d0dfeed..b8e3b888a8 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-FindOneAndUpdate.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-FindOneAndUpdate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-FindOneAndUpdate.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-FindOneAndUpdate.yml index 0641988b98..1459ca106c 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-FindOneAndUpdate.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-FindOneAndUpdate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-InsertFind.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-InsertFind.json index 9fafd10d4b..d637fcf9e7 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-InsertFind.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-InsertFind.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-InsertFind.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-InsertFind.yml index 076670d49e..578c08c247 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-InsertFind.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-InsertFind.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Update.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Update.json index 20ac25bfad..1b76019a4c 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Update.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Update.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Update.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Update.yml index 0aad7c4416..db16c3dd64 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Update.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Long-Update.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-WrongType.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-WrongType.json index 5a6e650ab4..704a693b8f 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-WrongType.json +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-WrongType.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-WrongType.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-WrongType.yml index b44e8c5055..9f1a93386a 100644 --- a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-WrongType.yml +++ b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-WrongType.yml @@ -7,6 +7,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/test/spec/client-side-encryption/tests/legacy/getMore.json b/test/spec/client-side-encryption/tests/legacy/getMore.json index ee99bf7537..94e788ef61 100644 --- a/test/spec/client-side-encryption/tests/legacy/getMore.json +++ b/test/spec/client-side-encryption/tests/legacy/getMore.json @@ -216,7 +216,10 @@ "command_started_event": { "command": { "getMore": { - "$$type": "long" + "$$type": [ + "int", + "long" + ] }, "collection": "default", "batchSize": 2 diff --git a/test/spec/client-side-encryption/tests/legacy/getMore.yml b/test/spec/client-side-encryption/tests/legacy/getMore.yml index 4359ee8917..dd246e9fa1 100644 --- a/test/spec/client-side-encryption/tests/legacy/getMore.yml +++ b/test/spec/client-side-encryption/tests/legacy/getMore.yml @@ -48,7 +48,7 @@ tests: command_name: find - command_started_event: command: - getMore: { $$type: "long" } + getMore: { $$type: [ int, long ] } collection: *collection_name batchSize: 2 command_name: getMore