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 be8bc5e340a..d1f2ad69c0e 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 @@ -7,13 +7,8 @@ import { runUnifiedSuite } from '../../tools/unified-spec-runner/runner'; const skippedSpecs = {}; const skippedTests = { - 'Tailable cursor iteration timeoutMS is refreshed for getMore - failure': 'TODO(NODE-6493)', - 'Tailable cursor awaitData iteration timeoutMS is refreshed for getMore - failure': - 'TODO(NODE-6493)', 'command is not sent if RTT is greater than timeoutMS': 'TODO(DRIVERS-2965)', - 'Non=tailable cursor iteration timeoutMS is refreshed for getMore if timeoutMode is iteration - failure': - 'TODO(DRIVERS-2965)', - 'Non-tailable cursor lifetime remaining timeoutMS applied to getMore if timeoutMode is unset': + 'Non-tailable cursor iteration timeoutMS is refreshed for getMore if timeoutMode is iteration - failure': 'TODO(DRIVERS-2965)', 'maxTimeMS value in the command is less than timeoutMS': 'TODO(DRIVERS-2970): see modified test in unified-csot-node-specs', diff --git a/test/spec/client-side-operations-timeout/runCursorCommand.json b/test/spec/client-side-operations-timeout/runCursorCommand.json index 5fc0be33997..36f774fb5af 100644 --- a/test/spec/client-side-operations-timeout/runCursorCommand.json +++ b/test/spec/client-side-operations-timeout/runCursorCommand.json @@ -200,7 +200,7 @@ }, "collection": "collection", "maxTimeMS": { - "$$exists": true + "$$exists": false } } } @@ -210,7 +210,7 @@ ] }, { - "description": "Non=tailable cursor iteration timeoutMS is refreshed for getMore if timeoutMode is iteration - failure", + "description": "Non-tailable cursor iteration timeoutMS is refreshed for getMore if timeoutMode is iteration - failure", "runOnRequirements": [ { "serverless": "forbid" diff --git a/test/spec/client-side-operations-timeout/runCursorCommand.yml b/test/spec/client-side-operations-timeout/runCursorCommand.yml index 16a648e0280..91a18d6dd81 100644 --- a/test/spec/client-side-operations-timeout/runCursorCommand.yml +++ b/test/spec/client-side-operations-timeout/runCursorCommand.yml @@ -70,7 +70,7 @@ tests: runOnRequirements: - serverless: forbid operations: - # Block find/getMore for 15ms. + # Block find/getMore for 60ms. - name: failPoint object: testRunner arguments: @@ -83,8 +83,9 @@ tests: blockConnection: true blockTimeMS: 60 # Run a find with timeoutMS less than double our failPoint blockTimeMS and - # batchSize less than the total document count will cause a find and a getMore to be sent. - # Both will block for 60ms so together they will go over the timeout. + # batchSize less than the total document count will cause a find and a + # getMore to be sent. Both will block for 60ms so together they will go + # over the timeout. - name: runCursorCommand object: *db arguments: @@ -106,12 +107,12 @@ tests: command: getMore: { $$type: [int, long] } collection: *collection - maxTimeMS: { $$exists: true } + maxTimeMS: { $$exists: false } # If timeoutMode=ITERATION, timeoutMS applies separately to the initial find and the getMore on the cursor. Neither # command should have a maxTimeMS field. This is a failure test. The "find" inherits timeoutMS=100 and "getMore" # commands are blocked for 60ms, causing iteration to fail with a timeout error. - - description: Non=tailable cursor iteration timeoutMS is refreshed for getMore if timeoutMode is iteration - failure + - description: Non-tailable cursor iteration timeoutMS is refreshed for getMore if timeoutMode is iteration - failure runOnRequirements: - serverless: forbid operations: