From 2100441ad5204b058da08bb248185aa5e8b7aa37 Mon Sep 17 00:00:00 2001 From: Bailey Pearson Date: Wed, 30 Oct 2024 15:12:49 -0600 Subject: [PATCH 1/2] test sync --- .../unified/commit-retry.json | 7 ++++++- .../unified/commit-retry.yml | 5 ++++- .../unified/commit-writeconcernerror.json | 17 ++++++++++++++++- .../unified/commit-writeconcernerror.yml | 11 ++++++++++- .../transactions/unified/retryable-commit.json | 5 +++++ .../transactions/unified/retryable-commit.yml | 3 +++ 6 files changed, 44 insertions(+), 4 deletions(-) diff --git a/test/spec/transactions-convenient-api/unified/commit-retry.json b/test/spec/transactions-convenient-api/unified/commit-retry.json index 853562e32ea..cc802011673 100644 --- a/test/spec/transactions-convenient-api/unified/commit-retry.json +++ b/test/spec/transactions-convenient-api/unified/commit-retry.json @@ -1,6 +1,6 @@ { "description": "commit-retry", - "schemaVersion": "1.3", + "schemaVersion": "1.4", "runOnRequirements": [ { "minServerVersion": "4.0", @@ -422,6 +422,11 @@ }, { "description": "commit is not retried after MaxTimeMSExpired error", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "failPoint", diff --git a/test/spec/transactions-convenient-api/unified/commit-retry.yml b/test/spec/transactions-convenient-api/unified/commit-retry.yml index 023e2daea25..63ff0f30be3 100644 --- a/test/spec/transactions-convenient-api/unified/commit-retry.yml +++ b/test/spec/transactions-convenient-api/unified/commit-retry.yml @@ -1,6 +1,6 @@ description: commit-retry -schemaVersion: '1.3' +schemaVersion: '1.4' runOnRequirements: - minServerVersion: '4.0' @@ -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/test/spec/transactions-convenient-api/unified/commit-writeconcernerror.json b/test/spec/transactions-convenient-api/unified/commit-writeconcernerror.json index a6f6e6bd7fa..a455a450bff 100644 --- a/test/spec/transactions-convenient-api/unified/commit-writeconcernerror.json +++ b/test/spec/transactions-convenient-api/unified/commit-writeconcernerror.json @@ -1,6 +1,6 @@ { "description": "commit-writeconcernerror", - "schemaVersion": "1.3", + "schemaVersion": "1.4", "runOnRequirements": [ { "minServerVersion": "4.0", @@ -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/test/spec/transactions-convenient-api/unified/commit-writeconcernerror.yml b/test/spec/transactions-convenient-api/unified/commit-writeconcernerror.yml index 44877fa008f..a4a80839a34 100644 --- a/test/spec/transactions-convenient-api/unified/commit-writeconcernerror.yml +++ b/test/spec/transactions-convenient-api/unified/commit-writeconcernerror.yml @@ -1,6 +1,6 @@ description: commit-writeconcernerror -schemaVersion: '1.3' +schemaVersion: '1.4' # For `serverless` in `runOnRequirements` runOnRequirements: - minServerVersion: '4.0' @@ -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/test/spec/transactions/unified/retryable-commit.json b/test/spec/transactions/unified/retryable-commit.json index b794c1c55c9..7d7e52495d8 100644 --- a/test/spec/transactions/unified/retryable-commit.json +++ b/test/spec/transactions/unified/retryable-commit.json @@ -89,6 +89,11 @@ "tests": [ { "description": "commitTransaction fails after Interrupted", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "object": "testRunner", diff --git a/test/spec/transactions/unified/retryable-commit.yml b/test/spec/transactions/unified/retryable-commit.yml index 916944065a7..ed0f64978d5 100644 --- a/test/spec/transactions/unified/retryable-commit.yml +++ b/test/spec/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 4e7e78e26a0a6f1ee75fb73a81fcb2c40c8e3415 Mon Sep 17 00:00:00 2001 From: Bailey Pearson Date: Thu, 31 Oct 2024 07:31:18 -0600 Subject: [PATCH 2/2] asdf --- .evergreen/run-serverless-tests.sh | 1 + .../transactions-convenient-api.spec.test.ts | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.evergreen/run-serverless-tests.sh b/.evergreen/run-serverless-tests.sh index 32322e56b1e..6134745d072 100755 --- a/.evergreen/run-serverless-tests.sh +++ b/.evergreen/run-serverless-tests.sh @@ -20,6 +20,7 @@ npx mocha \ test/integration/sessions/sessions.prose.test.ts \ test/integration/sessions/sessions.test.ts \ test/integration/transactions/transactions.spec.test.ts \ + test/integration/transactions-convenient-api/transactions-convenient-api.spec.test.ts \ test/integration/transactions/transactions.test.ts \ test/integration/versioned-api/versioned_api.spec.test.ts \ test/integration/load-balancers/load_balancers.spec.test.ts \ diff --git a/test/integration/transactions-convenient-api/transactions-convenient-api.spec.test.ts b/test/integration/transactions-convenient-api/transactions-convenient-api.spec.test.ts index 8b4c0ee3d5f..e1ceb9ec4c1 100644 --- a/test/integration/transactions-convenient-api/transactions-convenient-api.spec.test.ts +++ b/test/integration/transactions-convenient-api/transactions-convenient-api.spec.test.ts @@ -10,16 +10,6 @@ const SKIPPED_TESTS = [ ]; describe('Transactions Convenient API Spec Unified Tests', function () { - beforeEach(function () { - if (this.configuration.topologyType === 'LoadBalanced') { - if (this.currentTest) { - this.currentTest.skipReason = - 'TODO(NODE-5931) - Fix socket leaks in load balancer transaction tests.'; - } - this.skip(); - } - }); - runUnifiedSuite(loadSpecTests(path.join('transactions-convenient-api', 'unified')), test => { return SKIPPED_TESTS.includes(test.description) ? 'TODO(NODE-5855): Skipping failing transaction tests'