diff --git a/src/client-side-encryption/client_encryption.ts b/src/client-side-encryption/client_encryption.ts index 65676c5468..4d82b12463 100644 --- a/src/client-side-encryption/client_encryption.ts +++ b/src/client-side-encryption/client_encryption.ts @@ -313,7 +313,7 @@ export class ClientEncryption { .collection(collectionName) .bulkWrite(replacements, { writeConcern: { w: 'majority' }, - timeoutMS: timeoutContext?.remainingTimeMS + timeoutMS: timeoutContext.csotEnabled() ? timeoutContext?.remainingTimeMS : undefined }); return { bulkWriteResult: result }; diff --git a/test/integration/client-side-encryption/driver.test.ts b/test/integration/client-side-encryption/driver.test.ts index c410004623..0804794947 100644 --- a/test/integration/client-side-encryption/driver.test.ts +++ b/test/integration/client-side-encryption/driver.test.ts @@ -541,7 +541,7 @@ describe('Client Side Encryption Functional', function () { // TOOD, does not make rewriteManyDataKey fail describe.skip('when the find and bulk operation takes too long', function () { - // together they add up to 600, exceeding the timeout of 500 + // together they add up to 800, exceeding the timeout of 500 makeBlockingFailFor('update', 400); makeBlockingFailFor('listCollections', 400);