From 582ae727b7e5ae407c70e6337b88ee8f4d8d7d17 Mon Sep 17 00:00:00 2001 From: Kevin Albertson Date: Wed, 30 Oct 2024 16:20:57 -0400 Subject: [PATCH 1/4] RUST-2042 sync fle2v2-Rangev2-Compact to 9058491f2d5b5651913a56e373121a24d6498673 --- .../client-side-encryption/legacy/fle2v2-Rangev2-Compact.json | 3 +-- .../client-side-encryption/legacy/fle2v2-Rangev2-Compact.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/test/spec/json/client-side-encryption/legacy/fle2v2-Rangev2-Compact.json b/src/test/spec/json/client-side-encryption/legacy/fle2v2-Rangev2-Compact.json index bba9f2553..59241927c 100644 --- a/src/test/spec/json/client-side-encryption/legacy/fle2v2-Rangev2-Compact.json +++ b/src/test/spec/json/client-side-encryption/legacy/fle2v2-Rangev2-Compact.json @@ -6,8 +6,7 @@ "replicaset", "sharded", "load-balanced" - ], - "serverless": "forbid" + ] } ], "database_name": "default", diff --git a/src/test/spec/json/client-side-encryption/legacy/fle2v2-Rangev2-Compact.yml b/src/test/spec/json/client-side-encryption/legacy/fle2v2-Rangev2-Compact.yml index d49c084ef..9ec6c3e58 100644 --- a/src/test/spec/json/client-side-encryption/legacy/fle2v2-Rangev2-Compact.yml +++ b/src/test/spec/json/client-side-encryption/legacy/fle2v2-Rangev2-Compact.yml @@ -3,7 +3,6 @@ runOn: - minServerVersion: "8.0.0" # Require range v2 support on server. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] - serverless: forbid # Skip on serverless until CLOUDP-267864 is resolved. database_name: "default" collection_name: &collection_name "default" data: [] @@ -91,4 +90,4 @@ tests: } } encryptionInformation: *encryptionInformation - command_name: compactStructuredEncryptionData \ No newline at end of file + command_name: compactStructuredEncryptionData From 30aa376df4efeaf898b32c4462ab881819e974f6 Mon Sep 17 00:00:00 2001 From: Kevin Albertson Date: Wed, 30 Oct 2024 16:21:28 -0400 Subject: [PATCH 2/4] sync tests updated in 24817a5caa0526725d480f9a8b3fbb8714507311 --- .../json/crud/unified/client-bulkWrite-replaceOne-sort.json | 3 ++- .../json/crud/unified/client-bulkWrite-replaceOne-sort.yml | 1 + .../json/crud/unified/client-bulkWrite-updateOne-sort.json | 3 ++- .../spec/json/crud/unified/client-bulkWrite-updateOne-sort.yml | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-replaceOne-sort.json b/src/test/spec/json/crud/unified/client-bulkWrite-replaceOne-sort.json index 53218c1f4..b86bc5f94 100644 --- a/src/test/spec/json/crud/unified/client-bulkWrite-replaceOne-sort.json +++ b/src/test/spec/json/crud/unified/client-bulkWrite-replaceOne-sort.json @@ -3,7 +3,8 @@ "schemaVersion": "1.4", "runOnRequirements": [ { - "minServerVersion": "8.0" + "minServerVersion": "8.0", + "serverless": "forbid" } ], "createEntities": [ diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-replaceOne-sort.yml b/src/test/spec/json/crud/unified/client-bulkWrite-replaceOne-sort.yml index 45ef30045..a059012c9 100644 --- a/src/test/spec/json/crud/unified/client-bulkWrite-replaceOne-sort.yml +++ b/src/test/spec/json/crud/unified/client-bulkWrite-replaceOne-sort.yml @@ -4,6 +4,7 @@ schemaVersion: "1.4" runOnRequirements: - minServerVersion: "8.0" + serverless: forbid # Serverless does not support bulkWrite. See createEntities: - client: diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-updateOne-sort.json b/src/test/spec/json/crud/unified/client-bulkWrite-updateOne-sort.json index 4a07b8b97..ef75dcb37 100644 --- a/src/test/spec/json/crud/unified/client-bulkWrite-updateOne-sort.json +++ b/src/test/spec/json/crud/unified/client-bulkWrite-updateOne-sort.json @@ -3,7 +3,8 @@ "schemaVersion": "1.4", "runOnRequirements": [ { - "minServerVersion": "8.0" + "minServerVersion": "8.0", + "serverless": "forbid" } ], "createEntities": [ diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-updateOne-sort.yml b/src/test/spec/json/crud/unified/client-bulkWrite-updateOne-sort.yml index ce2437397..2eb9dd5b7 100644 --- a/src/test/spec/json/crud/unified/client-bulkWrite-updateOne-sort.yml +++ b/src/test/spec/json/crud/unified/client-bulkWrite-updateOne-sort.yml @@ -4,6 +4,7 @@ schemaVersion: "1.4" runOnRequirements: - minServerVersion: "8.0" + serverless: forbid # Serverless does not support bulkWrite. See createEntities: - client: From 30ec4d43cee534734e952ba49afb2a9c6ec24f22 Mon Sep 17 00:00:00 2001 From: Kevin Albertson Date: Wed, 30 Oct 2024 16:23:00 -0400 Subject: [PATCH 3/4] RUST-2076 sync tests updated in https://github.com/mongodb/specifications/pull/1680 --- .../unified/commit-retry.json | 5 +++++ .../unified/commit-retry.yml | 3 +++ .../unified/commit-writeconcernerror.json | 15 +++++++++++++++ .../unified/commit-writeconcernerror.yml | 9 +++++++++ .../transactions/unified/retryable-commit.json | 5 +++++ .../transactions/unified/retryable-commit.yml | 3 +++ 6 files changed, 40 insertions(+) diff --git a/src/test/spec/json/transactions-convenient-api/unified/commit-retry.json b/src/test/spec/json/transactions-convenient-api/unified/commit-retry.json index 928f0167e..cc8020116 100644 --- a/src/test/spec/json/transactions-convenient-api/unified/commit-retry.json +++ b/src/test/spec/json/transactions-convenient-api/unified/commit-retry.json @@ -422,6 +422,11 @@ }, { "description": "commit is not retried after MaxTimeMSExpired error", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "failPoint", diff --git a/src/test/spec/json/transactions-convenient-api/unified/commit-retry.yml b/src/test/spec/json/transactions-convenient-api/unified/commit-retry.yml index 22d212548..63ff0f30b 100644 --- a/src/test/spec/json/transactions-convenient-api/unified/commit-retry.yml +++ b/src/test/spec/json/transactions-convenient-api/unified/commit-retry.yml @@ -212,6 +212,9 @@ tests: - { _id: 1 } - description: commit is not retried after MaxTimeMSExpired error + runOnRequirements: + # Serverless sets empty `codeName` on failpoint errors. Remove once CLOUDP-280424 is fixed. + - serverless: forbid operations: - name: failPoint object: testRunner diff --git a/src/test/spec/json/transactions-convenient-api/unified/commit-writeconcernerror.json b/src/test/spec/json/transactions-convenient-api/unified/commit-writeconcernerror.json index a6f6e6bd7..2f8acb5bf 100644 --- a/src/test/spec/json/transactions-convenient-api/unified/commit-writeconcernerror.json +++ b/src/test/spec/json/transactions-convenient-api/unified/commit-writeconcernerror.json @@ -414,6 +414,11 @@ }, { "description": "commitTransaction is not retried after UnknownReplWriteConcern error", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "failPoint", @@ -546,6 +551,11 @@ }, { "description": "commitTransaction is not retried after UnsatisfiableWriteConcern error", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "failPoint", @@ -678,6 +688,11 @@ }, { "description": "commitTransaction is not retried after MaxTimeMSExpired error", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "failPoint", diff --git a/src/test/spec/json/transactions-convenient-api/unified/commit-writeconcernerror.yml b/src/test/spec/json/transactions-convenient-api/unified/commit-writeconcernerror.yml index 44877fa00..86bc467b0 100644 --- a/src/test/spec/json/transactions-convenient-api/unified/commit-writeconcernerror.yml +++ b/src/test/spec/json/transactions-convenient-api/unified/commit-writeconcernerror.yml @@ -151,6 +151,9 @@ tests: outcome: *outcome - description: commitTransaction is not retried after UnknownReplWriteConcern error + runOnRequirements: + # Serverless sets empty `codeName` on failpoint errors. Remove once CLOUDP-280424 is fixed. + - serverless: forbid operations: - name: failPoint object: testRunner @@ -203,6 +206,9 @@ tests: outcome: *outcome - description: commitTransaction is not retried after UnsatisfiableWriteConcern error + runOnRequirements: + # Serverless sets empty `codeName` on failpoint errors. Remove once CLOUDP-280424 is fixed. + - serverless: forbid operations: - name: failPoint object: testRunner @@ -226,6 +232,9 @@ tests: outcome: *outcome - description: commitTransaction is not retried after MaxTimeMSExpired error + runOnRequirements: + # Serverless sets empty `codeName` on failpoint errors. Remove once CLOUDP-280424 is fixed. + - serverless: forbid operations: - name: failPoint object: testRunner diff --git a/src/test/spec/json/transactions/unified/retryable-commit.json b/src/test/spec/json/transactions/unified/retryable-commit.json index b794c1c55..7d7e52495 100644 --- a/src/test/spec/json/transactions/unified/retryable-commit.json +++ b/src/test/spec/json/transactions/unified/retryable-commit.json @@ -89,6 +89,11 @@ "tests": [ { "description": "commitTransaction fails after Interrupted", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "object": "testRunner", diff --git a/src/test/spec/json/transactions/unified/retryable-commit.yml b/src/test/spec/json/transactions/unified/retryable-commit.yml index 916944065..ed0f64978 100644 --- a/src/test/spec/json/transactions/unified/retryable-commit.yml +++ b/src/test/spec/json/transactions/unified/retryable-commit.yml @@ -67,6 +67,9 @@ initialData: tests: - description: 'commitTransaction fails after Interrupted' + runOnRequirements: + # Serverless sets empty `codeName` on failpoint errors. Remove once CLOUDP-280424 is fixed. + - serverless: forbid operations: - object: testRunner From 420fcc8d2bed907289c51b7397af93f82f69f0a5 Mon Sep 17 00:00:00 2001 From: Kevin Albertson Date: Wed, 30 Oct 2024 16:27:55 -0400 Subject: [PATCH 4/4] resync yaml file To get updated comment --- .../spec/json/crud/unified/client-bulkWrite-replaceOne-sort.yml | 2 +- .../spec/json/crud/unified/client-bulkWrite-updateOne-sort.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-replaceOne-sort.yml b/src/test/spec/json/crud/unified/client-bulkWrite-replaceOne-sort.yml index a059012c9..a159ba595 100644 --- a/src/test/spec/json/crud/unified/client-bulkWrite-replaceOne-sort.yml +++ b/src/test/spec/json/crud/unified/client-bulkWrite-replaceOne-sort.yml @@ -4,7 +4,7 @@ schemaVersion: "1.4" runOnRequirements: - minServerVersion: "8.0" - serverless: forbid # Serverless does not support bulkWrite. See + serverless: forbid # Serverless does not support bulkWrite: CLOUDP-256344. createEntities: - client: diff --git a/src/test/spec/json/crud/unified/client-bulkWrite-updateOne-sort.yml b/src/test/spec/json/crud/unified/client-bulkWrite-updateOne-sort.yml index 2eb9dd5b7..73a265d6b 100644 --- a/src/test/spec/json/crud/unified/client-bulkWrite-updateOne-sort.yml +++ b/src/test/spec/json/crud/unified/client-bulkWrite-updateOne-sort.yml @@ -4,7 +4,7 @@ schemaVersion: "1.4" runOnRequirements: - minServerVersion: "8.0" - serverless: forbid # Serverless does not support bulkWrite. See + serverless: forbid # Serverless does not support bulkWrite: CLOUDP-256344. createEntities: - client: