From e6aaef0a22fbbd4a6441966ed2783f54231a2ffc Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Tue, 24 Sep 2024 08:36:09 -0400 Subject: [PATCH 1/2] Sync client-side-encryption legacy specification tests --- .../resources/client-side-encryption/legacy/explain.json | 2 +- .../client-side-encryption/legacy/fle2v2-Compact.json | 2 +- .../legacy/fle2v2-Rangev2-Compact.json | 3 ++- .../resources/client-side-encryption/legacy/getMore.json | 5 ++++- .../client-side-encryption/legacy/namedKMS.json | 2 +- .../client-side-encryption/legacy/timeoutMS.json | 9 ++++----- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/driver-core/src/test/resources/client-side-encryption/legacy/explain.json b/driver-core/src/test/resources/client-side-encryption/legacy/explain.json index 0e451e4818a..8ca3b48d37d 100644 --- a/driver-core/src/test/resources/client-side-encryption/legacy/explain.json +++ b/driver-core/src/test/resources/client-side-encryption/legacy/explain.json @@ -1,7 +1,7 @@ { "runOn": [ { - "minServerVersion": "4.1.10" + "minServerVersion": "7.0.0" } ], "database_name": "default", diff --git a/driver-core/src/test/resources/client-side-encryption/legacy/fle2v2-Compact.json b/driver-core/src/test/resources/client-side-encryption/legacy/fle2v2-Compact.json index 85fb8bf607a..868095e1e64 100644 --- a/driver-core/src/test/resources/client-side-encryption/legacy/fle2v2-Compact.json +++ b/driver-core/src/test/resources/client-side-encryption/legacy/fle2v2-Compact.json @@ -230,4 +230,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/driver-core/src/test/resources/client-side-encryption/legacy/fle2v2-Rangev2-Compact.json b/driver-core/src/test/resources/client-side-encryption/legacy/fle2v2-Rangev2-Compact.json index 59241927ca1..bba9f25535a 100644 --- a/driver-core/src/test/resources/client-side-encryption/legacy/fle2v2-Rangev2-Compact.json +++ b/driver-core/src/test/resources/client-side-encryption/legacy/fle2v2-Rangev2-Compact.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "serverless": "forbid" } ], "database_name": "default", diff --git a/driver-core/src/test/resources/client-side-encryption/legacy/getMore.json b/driver-core/src/test/resources/client-side-encryption/legacy/getMore.json index ee99bf7537e..94e788ef61d 100644 --- a/driver-core/src/test/resources/client-side-encryption/legacy/getMore.json +++ b/driver-core/src/test/resources/client-side-encryption/legacy/getMore.json @@ -216,7 +216,10 @@ "command_started_event": { "command": { "getMore": { - "$$type": "long" + "$$type": [ + "int", + "long" + ] }, "collection": "default", "batchSize": 2 diff --git a/driver-core/src/test/resources/client-side-encryption/legacy/namedKMS.json b/driver-core/src/test/resources/client-side-encryption/legacy/namedKMS.json index 394a6ac5484..c859443585b 100644 --- a/driver-core/src/test/resources/client-side-encryption/legacy/namedKMS.json +++ b/driver-core/src/test/resources/client-side-encryption/legacy/namedKMS.json @@ -194,4 +194,4 @@ } } ] -} \ No newline at end of file +} diff --git a/driver-core/src/test/resources/client-side-encryption/legacy/timeoutMS.json b/driver-core/src/test/resources/client-side-encryption/legacy/timeoutMS.json index 247541646cc..b667767cfcd 100644 --- a/driver-core/src/test/resources/client-side-encryption/legacy/timeoutMS.json +++ b/driver-core/src/test/resources/client-side-encryption/legacy/timeoutMS.json @@ -4,7 +4,6 @@ "minServerVersion": "4.4" } ], - "comment": "Updated timeoutMS and blockTimeMS manually to address race conditions in tests with SSL handshake.", "database_name": "cse-timeouts-db", "collection_name": "cse-timeouts-coll", "data": [], @@ -111,7 +110,7 @@ "listCollections" ], "blockConnection": true, - "blockTimeMS": 250 + "blockTimeMS": 60 } }, "clientOptions": { @@ -120,7 +119,7 @@ "aws": {} } }, - "timeoutMS": 200 + "timeoutMS": 50 }, "operations": [ { @@ -170,7 +169,7 @@ "find" ], "blockConnection": true, - "blockTimeMS": 300 + "blockTimeMS": 30 } }, "clientOptions": { @@ -179,7 +178,7 @@ "aws": {} } }, - "timeoutMS": 500 + "timeoutMS": 50 }, "operations": [ { From 2dc85ee0b4bb0259925bf51f7d81c5b420a89b34 Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Tue, 24 Sep 2024 09:06:10 -0400 Subject: [PATCH 2/2] Revert changes to timeoutMS.json --- .../client-side-encryption/legacy/timeoutMS.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/driver-core/src/test/resources/client-side-encryption/legacy/timeoutMS.json b/driver-core/src/test/resources/client-side-encryption/legacy/timeoutMS.json index b667767cfcd..247541646cc 100644 --- a/driver-core/src/test/resources/client-side-encryption/legacy/timeoutMS.json +++ b/driver-core/src/test/resources/client-side-encryption/legacy/timeoutMS.json @@ -4,6 +4,7 @@ "minServerVersion": "4.4" } ], + "comment": "Updated timeoutMS and blockTimeMS manually to address race conditions in tests with SSL handshake.", "database_name": "cse-timeouts-db", "collection_name": "cse-timeouts-coll", "data": [], @@ -110,7 +111,7 @@ "listCollections" ], "blockConnection": true, - "blockTimeMS": 60 + "blockTimeMS": 250 } }, "clientOptions": { @@ -119,7 +120,7 @@ "aws": {} } }, - "timeoutMS": 50 + "timeoutMS": 200 }, "operations": [ { @@ -169,7 +170,7 @@ "find" ], "blockConnection": true, - "blockTimeMS": 30 + "blockTimeMS": 300 } }, "clientOptions": { @@ -178,7 +179,7 @@ "aws": {} } }, - "timeoutMS": 50 + "timeoutMS": 500 }, "operations": [ {