From 894f583783ff8b6cddc16f023ea231de7ccf765f Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Tue, 8 Apr 2025 13:35:57 +0100 Subject: [PATCH 1/2] test(NODE-6862): fix flaky CSOT timeout spec tests test(NODE-6862): unskip flaky csot spec test --- .../client_side_operations_timeout.spec.test.ts | 5 +---- test/tools/runner/flaky.ts | 3 ++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/test/integration/client-side-operations-timeout/client_side_operations_timeout.spec.test.ts b/test/integration/client-side-operations-timeout/client_side_operations_timeout.spec.test.ts index 4980b58dd2..81d0524323 100644 --- a/test/integration/client-side-operations-timeout/client_side_operations_timeout.spec.test.ts +++ b/test/integration/client-side-operations-timeout/client_side_operations_timeout.spec.test.ts @@ -17,10 +17,7 @@ const skippedTests = { 'TODO(DRIVERS-2970): see modified test in unified-csot-node-specs', 'timeoutMS is refreshed for getMore - failure': 'TODO(DRIVERS-2965): see modified test in unified-csot-node-specs', - 'timeoutMS applies to full resume attempt in a next call': 'TODO(DRIVERS-3006)', - 'timeoutMS is refreshed for getMore if maxAwaitTimeMS is set': 'TODO(DRIVERS-3018)', - 'socketTimeoutMS is ignored if timeoutMS is set - dropIndex on collection': - 'TODO(NODE-6862): fix flaky test' + 'timeoutMS is refreshed for getMore if maxAwaitTimeMS is set': 'TODO(DRIVERS-3018)' }; describe('CSOT spec tests', function () { diff --git a/test/tools/runner/flaky.ts b/test/tools/runner/flaky.ts index 7ffa6c8466..df484e5d3c 100644 --- a/test/tools/runner/flaky.ts +++ b/test/tools/runner/flaky.ts @@ -34,5 +34,6 @@ export const flakyTests = [ 'Retryable Reads (unified) retryable reads handshake failures collection.aggregate succeeds after retryable handshake network error', 'CSOT spec tests legacy timeouts behave correctly for retryable operations operation fails after two consecutive socket timeouts - aggregate on collection', 'Server Discovery and Monitoring Prose Tests Connection Pool Management ensure monitors properly create and unpause connection pools when they discover servers', - 'CSOT spec tests legacy timeouts behave correctly for retryable operations operation succeeds after one socket timeout - aggregate on collection' + 'CSOT spec tests legacy timeouts behave correctly for retryable operations operation succeeds after one socket timeout - aggregate on collection', + 'CSOT spec tests operations ignore deprecated timeout options if timeoutMS is set socketTimeoutMS is ignored if timeoutMS is set - dropIndex on collection' ]; From b86723e46a67dea339fd8570bad58aa3c7856416 Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Tue, 15 Apr 2025 21:37:51 +0200 Subject: [PATCH 2/2] fix: skip test again --- .../client_side_operations_timeout.spec.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/client-side-operations-timeout/client_side_operations_timeout.spec.test.ts b/test/integration/client-side-operations-timeout/client_side_operations_timeout.spec.test.ts index 81d0524323..a1b0791026 100644 --- a/test/integration/client-side-operations-timeout/client_side_operations_timeout.spec.test.ts +++ b/test/integration/client-side-operations-timeout/client_side_operations_timeout.spec.test.ts @@ -17,6 +17,7 @@ const skippedTests = { 'TODO(DRIVERS-2970): see modified test in unified-csot-node-specs', 'timeoutMS is refreshed for getMore - failure': 'TODO(DRIVERS-2965): see modified test in unified-csot-node-specs', + 'timeoutMS applies to full resume attempt in a next call': 'TODO(DRIVERS-3006)', 'timeoutMS is refreshed for getMore if maxAwaitTimeMS is set': 'TODO(DRIVERS-3018)' };