From 46da55b4d10867e1bb18f0c0d9ff5ce691f9f013 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 8 May 2024 16:50:24 -0500 Subject: [PATCH 1/3] PYTHON-4429 Add Changelog for 4.7.2 (#1635) --- doc/changelog.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/doc/changelog.rst b/doc/changelog.rst index e3469ae92..d18192613 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -6,6 +6,22 @@ Changes in Version 4.8.0 .. warning:: PyMongo 4.8 drops support for Python 3.7 and PyPy 3.8: Python 3.8+ or PyPy 3.9+ is now required. +Changes in Version 4.7.2 +------------------------- + +Version 4.7.2 fixes a bug introduced in 4.7.0: + +- Fixed a bug where PyMongo could not be used with the Nuitka compiler. + +Issues Resolved +............... + +See the `PyMongo 4.7.2 release notes in JIRA`_ for the list of resolved issues +in this release. + +.. _PyMongo 4.7.2 release notes in JIRA: https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=10004&version=39710 + + Changes in Version 4.7.1 ------------------------- From 7b12dd482c4b32885e706830090555e2901fbc11 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 8 May 2024 19:31:19 -0500 Subject: [PATCH 2/3] PYTHON-4256 OIDC Test Cleanup (#1632) --- test/auth/unified/mongodb-oidc-no-retry.json | 3 ++- test/auth_oidc/test_auth_oidc.py | 25 +++++++------------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/test/auth/unified/mongodb-oidc-no-retry.json b/test/auth/unified/mongodb-oidc-no-retry.json index 9dbe19827..0a8658455 100644 --- a/test/auth/unified/mongodb-oidc-no-retry.json +++ b/test/auth/unified/mongodb-oidc-no-retry.json @@ -5,7 +5,8 @@ { "minServerVersion": "7.0", "auth": true, - "authMechanism": "MONGODB-OIDC" + "authMechanism": "MONGODB-OIDC", + "serverless": "forbid" } ], "createEntities": [ diff --git a/test/auth_oidc/test_auth_oidc.py b/test/auth_oidc/test_auth_oidc.py index 7ea565935..c7614fa0c 100644 --- a/test/auth_oidc/test_auth_oidc.py +++ b/test/auth_oidc/test_auth_oidc.py @@ -824,23 +824,7 @@ class TestAuthOIDCMachine(OIDCTestBase): # Close the client. client.close() - def test_2_4_oidc_callback_returns_invalid_data(self): - # Create a MongoClient configured with an OIDC callback that returns data not conforming to the OIDCCredential with extra fields. - class CustomCallback(OIDCCallback): - count = 0 - - def fetch(self, a): - self.count += 1 - return OIDCCallbackResult(access_token="bad value") - - client = self.create_client(request_cb=CustomCallback()) - # Perform a ``find`` operation that fails. - with self.assertRaises(OperationFailure): - client.test.test.find_one() - # Close the client. - client.close() - - def test_2_5_invalid_client_configuration_with_callback(self): + def test_2_4_invalid_client_configuration_with_callback(self): # Create a MongoClient configured with an OIDC callback and auth mechanism property ENVIRONMENT:test. request_cb = self.create_request_cb() props: Dict = {"OIDC_CALLBACK": request_cb, "ENVIRONMENT": "test"} @@ -848,6 +832,13 @@ class TestAuthOIDCMachine(OIDCTestBase): with self.assertRaises(ConfigurationError): self.create_client(authmechanismproperties=props) + def test_2_5_invalid_use_of_ALLOWED_HOSTS(self): + # Create an OIDC configured client with auth mechanism properties `{"ENVIRONMENT": "azure", "ALLOWED_HOSTS": []}`. + props: Dict = {"ENVIRONMENT": "azure", "ALLOWED_HOSTS": []} + # Assert it returns a client configuration error. + with self.assertRaises(ConfigurationError): + self.create_client(authmechanismproperties=props) + def test_3_1_authentication_failure_with_cached_tokens_fetch_a_new_token_and_retry(self): # Create a MongoClient and an OIDC callback that implements the provider logic. client = self.create_client() From da03da34c6498378d6a9a7f5c9c5c19cd579d9b1 Mon Sep 17 00:00:00 2001 From: Noah Stapp Date: Fri, 10 May 2024 10:00:13 -0700 Subject: [PATCH 3/3] PYTHON-4406 Skip rangePreview tests on server version 8.0+ (#1636) --- .../spec/legacy/fle2v2-Range-Date-Aggregate.json | 3 ++- .../spec/legacy/fle2v2-Range-Date-Correctness.json | 3 ++- .../spec/legacy/fle2v2-Range-Date-Delete.json | 3 ++- .../spec/legacy/fle2v2-Range-Date-FindOneAndUpdate.json | 3 ++- .../spec/legacy/fle2v2-Range-Date-InsertFind.json | 3 ++- .../spec/legacy/fle2v2-Range-Date-Update.json | 3 ++- .../spec/legacy/fle2v2-Range-Decimal-Aggregate.json | 3 ++- .../spec/legacy/fle2v2-Range-Decimal-Correctness.json | 3 ++- .../spec/legacy/fle2v2-Range-Decimal-Delete.json | 3 ++- .../spec/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.json | 3 ++- .../spec/legacy/fle2v2-Range-Decimal-InsertFind.json | 3 ++- .../spec/legacy/fle2v2-Range-Decimal-Update.json | 3 ++- .../spec/legacy/fle2v2-Range-DecimalPrecision-Aggregate.json | 3 ++- .../spec/legacy/fle2v2-Range-DecimalPrecision-Correctness.json | 3 ++- .../spec/legacy/fle2v2-Range-DecimalPrecision-Delete.json | 3 ++- .../legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.json | 3 ++- .../spec/legacy/fle2v2-Range-DecimalPrecision-InsertFind.json | 3 ++- .../spec/legacy/fle2v2-Range-DecimalPrecision-Update.json | 3 ++- .../spec/legacy/fle2v2-Range-Double-Aggregate.json | 3 ++- .../spec/legacy/fle2v2-Range-Double-Correctness.json | 3 ++- .../spec/legacy/fle2v2-Range-Double-Delete.json | 3 ++- .../spec/legacy/fle2v2-Range-Double-FindOneAndUpdate.json | 3 ++- .../spec/legacy/fle2v2-Range-Double-InsertFind.json | 3 ++- .../spec/legacy/fle2v2-Range-Double-Update.json | 3 ++- .../spec/legacy/fle2v2-Range-DoublePrecision-Aggregate.json | 3 ++- .../spec/legacy/fle2v2-Range-DoublePrecision-Correctness.json | 3 ++- .../spec/legacy/fle2v2-Range-DoublePrecision-Delete.json | 3 ++- .../legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.json | 3 ++- .../spec/legacy/fle2v2-Range-DoublePrecision-InsertFind.json | 3 ++- .../spec/legacy/fle2v2-Range-DoublePrecision-Update.json | 3 ++- .../spec/legacy/fle2v2-Range-Int-Aggregate.json | 3 ++- .../spec/legacy/fle2v2-Range-Int-Correctness.json | 3 ++- .../spec/legacy/fle2v2-Range-Int-Delete.json | 3 ++- .../spec/legacy/fle2v2-Range-Int-FindOneAndUpdate.json | 3 ++- .../spec/legacy/fle2v2-Range-Int-InsertFind.json | 3 ++- .../spec/legacy/fle2v2-Range-Int-Update.json | 3 ++- .../spec/legacy/fle2v2-Range-Long-Aggregate.json | 3 ++- .../spec/legacy/fle2v2-Range-Long-Correctness.json | 3 ++- .../spec/legacy/fle2v2-Range-Long-Delete.json | 3 ++- .../spec/legacy/fle2v2-Range-Long-FindOneAndUpdate.json | 3 ++- .../spec/legacy/fle2v2-Range-Long-InsertFind.json | 3 ++- .../spec/legacy/fle2v2-Range-Long-Update.json | 3 ++- .../spec/legacy/fle2v2-Range-WrongType.json | 3 ++- test/test_encryption.py | 1 + 44 files changed, 87 insertions(+), 43 deletions(-) diff --git a/test/client-side-encryption/spec/legacy/fle2v2-Range-Date-Aggregate.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Date-Aggregate.json index ba53b007b..9eaabe0d7 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Date-Aggregate.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Date-Correctness.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Date-Correctness.json index e9620efbe..fa887e089 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Date-Correctness.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Date-Delete.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Date-Delete.json index daaa09389..cce4faf18 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Date-Delete.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Date-FindOneAndUpdate.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Date-FindOneAndUpdate.json index 8500fa829..4392b6768 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Date-FindOneAndUpdate.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Date-InsertFind.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Date-InsertFind.json index 7de45ba00..27ce7881d 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Date-InsertFind.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Date-Update.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Date-Update.json index d5b62be06..f7d5a6af6 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Date-Update.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Decimal-Aggregate.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Decimal-Aggregate.json index 081bc577f..401ee34e3 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Decimal-Aggregate.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Decimal-Correctness.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Decimal-Correctness.json index 12fe7c8bc..758d3e573 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Decimal-Correctness.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Decimal-Delete.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Decimal-Delete.json index ac49d16a2..24a08f318 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Decimal-Delete.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.json index 88a235078..2a8070ecf 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Decimal-InsertFind.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Decimal-InsertFind.json index 54e43e4a2..2ef63f42b 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Decimal-InsertFind.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Decimal-Update.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Decimal-Update.json index b2b8136a9..8064eb1b1 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Decimal-Update.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-DecimalPrecision-Aggregate.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-DecimalPrecision-Aggregate.json index b078d1817..8cf143c09 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-DecimalPrecision-Aggregate.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-DecimalPrecision-Correctness.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-DecimalPrecision-Correctness.json index 0859e702a..a4b06998f 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-DecimalPrecision-Correctness.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-DecimalPrecision-Delete.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-DecimalPrecision-Delete.json index 6e1ad90cd..fad823483 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-DecimalPrecision-Delete.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.json index 1cfd19a1e..fb8f4f414 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-DecimalPrecision-InsertFind.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-DecimalPrecision-InsertFind.json index da7660972..79562802e 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-DecimalPrecision-InsertFind.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-DecimalPrecision-Update.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-DecimalPrecision-Update.json index 2d201948c..cc93b7694 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-DecimalPrecision-Update.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Double-Aggregate.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Double-Aggregate.json index c188f1f5a..79f26660f 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Double-Aggregate.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Double-Correctness.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Double-Correctness.json index 3e298127d..117e56af6 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Double-Correctness.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Double-Delete.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Double-Delete.json index dc0ba435f..40d8ed5bb 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Double-Delete.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Double-FindOneAndUpdate.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Double-FindOneAndUpdate.json index 4b96575e1..f0893ce66 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Double-FindOneAndUpdate.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Double-InsertFind.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Double-InsertFind.json index 4827b6838..d3dc2f830 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Double-InsertFind.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Double-Update.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Double-Update.json index c3284ad0f..9d6a1fbfd 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Double-Update.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-DoublePrecision-Aggregate.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-DoublePrecision-Aggregate.json index a2c1f3b75..4188685a2 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-DoublePrecision-Aggregate.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-DoublePrecision-Correctness.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-DoublePrecision-Correctness.json index d0c0601ce..60f1ea7a3 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-DoublePrecision-Correctness.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-DoublePrecision-Delete.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-DoublePrecision-Delete.json index a617442ee..4ed591d3f 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-DoublePrecision-Delete.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.json index 5565fb179..d8fbbfae7 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-DoublePrecision-InsertFind.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-DoublePrecision-InsertFind.json index a1d8c1785..4213b066d 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-DoublePrecision-InsertFind.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-DoublePrecision-Update.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-DoublePrecision-Update.json index 6ea99242b..89eb4c338 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-DoublePrecision-Update.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Int-Aggregate.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Int-Aggregate.json index b3b2826fa..686f0241b 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Int-Aggregate.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Int-Correctness.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Int-Correctness.json index 4932223ba..2964624f2 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Int-Correctness.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Int-Delete.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Int-Delete.json index 03f816e4b..531b3e759 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Int-Delete.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Int-FindOneAndUpdate.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Int-FindOneAndUpdate.json index d573f7b6a..402086cdb 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Int-FindOneAndUpdate.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Int-InsertFind.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Int-InsertFind.json index 04953663f..965b8a551 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Int-InsertFind.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Int-Update.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Int-Update.json index 4c7a3c278..6cf44ac78 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Int-Update.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Long-Aggregate.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Long-Aggregate.json index a7e77fd5c..6edb38a80 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Long-Aggregate.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Long-Correctness.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Long-Correctness.json index 365822c79..3d33f7381 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Long-Correctness.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Long-Delete.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Long-Delete.json index 17a01fe07..1b3278201 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Long-Delete.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Long-FindOneAndUpdate.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Long-FindOneAndUpdate.json index 918d0dfee..b8e3b888a 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Long-FindOneAndUpdate.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Long-InsertFind.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Long-InsertFind.json index 9fafd10d4..d637fcf9e 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Long-InsertFind.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-Long-Update.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-Long-Update.json index 20ac25bfa..1b76019a4 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-Long-Update.json +++ b/test/client-side-encryption/spec/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/client-side-encryption/spec/legacy/fle2v2-Range-WrongType.json b/test/client-side-encryption/spec/legacy/fle2v2-Range-WrongType.json index 5a6e650ab..704a693b8 100644 --- a/test/client-side-encryption/spec/legacy/fle2v2-Range-WrongType.json +++ b/test/client-side-encryption/spec/legacy/fle2v2-Range-WrongType.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/test/test_encryption.py b/test/test_encryption.py index e91560099..2a60b7295 100644 --- a/test/test_encryption.py +++ b/test/test_encryption.py @@ -2605,6 +2605,7 @@ class TestQueryableEncryptionDocsExample(EncryptionIntegrationTest): class TestRangeQueryProse(EncryptionIntegrationTest): @client_context.require_no_standalone @client_context.require_version_min(7, 0, -1) + @client_context.require_version_max(7, 9, 99) def setUp(self): super().setUp() self.key1_document = json_data("etc", "data", "keys", "key1-document.json")