test: remove <4.1 and 4.2 logic or tests

Author: durran

test/integration/change-streams/change_stream.test.ts

@@ -603,7 +603,7 @@ describe('Change Stream prose tests', function () {
     // - MUST NOT include a resumeAfter option
     // when resuming a change stream.
     it('$changeStream without results must include startAfter and not resumeAfter', {
-      metadata: { requires: { topology: 'replicaset', mongodb: '>=4.1.1' } },
+      metadata: { requires: { topology: 'replicaset' } },
       test: async function () {
         const events = [];
         client.on('commandStarted', e => recordEvent(events, e));
@@ -643,7 +643,7 @@ describe('Change Stream prose tests', function () {
     // - MUST NOT include a startAfter option
     // when resuming a change stream.
     it('$changeStream with results must include resumeAfter and not startAfter', {
-      metadata: { requires: { topology: 'replicaset', mongodb: '>=4.1.1' } },
+      metadata: { requires: { topology: 'replicaset' } },
       test: function (done) {
         let events = [];
         client.on('commandStarted', e => recordEvent(events, e));

test/integration/change-streams/change_streams.prose.test.ts

@@ -14,7 +14,6 @@ import { getEncryptExtraOptions } from '../../tools/utils';
 describe('Client Side Encryption Prose Corpus Test', function () {
   const metadata = {
     requires: {
-      mongodb: '>=4.2.0',
       clientSideEncryption: true as const
     }
   };

test/integration/client-side-encryption/client_side_encryption.prose.06.corpus.test.ts

@@ -5,8 +5,7 @@ import { ClientEncryption, type MongoClient } from '../../mongodb';
 
 const metadata: MongoDBMetadataUI = {
   requires: {
-    clientSideEncryption: true,
-    mongodb: '>=4.2.0'
+    clientSideEncryption: true
   }
 };
 

test/integration/client-side-encryption/client_side_encryption.prose.10.kms_tls.test.ts

@@ -104,7 +104,6 @@ function deadlockTest(
 const metadata: MongoDBMetadataUI = {
   requires: {
     clientSideEncryption: true,
-    mongodb: '>=4.2.0',
     topology: '!load-balanced'
   }
 };

test/integration/client-side-encryption/client_side_encryption.prose.12.deadlock.test.ts

@@ -15,7 +15,6 @@ import { getEncryptExtraOptions } from '../../tools/utils';
 const metadata: MongoDBMetadataUI = {
   requires: {
     clientSideEncryption: true,
-    mongodb: '>=4.2.0',
     topology: '!load-balanced'
   }
 };

test/integration/client-side-encryption/client_side_encryption.prose.14.decryption_events.test.ts

@@ -8,7 +8,6 @@ import { getEncryptExtraOptions } from '../../tools/utils';
 const metadata: MongoDBMetadataUI = {
   requires: {
     clientSideEncryption: true,
-    mongodb: '>=4.2.0',
     topology: '!load-balanced'
   }
 } as const;

test/integration/client-side-encryption/client_side_encryption.prose.26.custom_aws_credential_providers.test.ts

@@ -43,7 +43,6 @@ const noop = () => {};
 const metadata = {
   requires: {
     clientSideEncryption: true,
-    mongodb: '>=4.2.0',
     topology: '!load-balanced'
   }
 };

test/integration/client-side-encryption/client_side_encryption.prose.test.js

@@ -33,7 +33,6 @@ import { filterForCommands } from '../shared';
 
 const metadata: MongoDBMetadataUI = {
   requires: {
-    mongodb: '>=4.2.0',
     clientSideEncryption: true
   }
 };
@@ -699,7 +698,6 @@ describe('CSOT', function () {
 
     const metadata: MongoDBMetadataUI = {
       requires: {
-        mongodb: '>=4.2.0',
         clientSideEncryption: true
       }
     };
@@ -802,12 +800,6 @@ describe('CSOT', function () {
 
     const timeoutMS = 1000;
 
-    const metadata: MongoDBMetadataUI = {
-      requires: {
-        mongodb: '>=4.2.0'
-      }
-    };
-
     describe('#markCommand', function () {
       context(
         'when csot is enabled and markCommand() takes longer than the remaining timeoutMS',
@@ -837,7 +829,7 @@ describe('CSOT', function () {
             sinon.restore();
           });
 
-          it('the command should fail due to a timeout error', metadata, async function () {
+          it('the command should fail due to a timeout error', async function () {
             const { duration, result: error } = await measureDuration(() =>
               stateMachine
                 .markCommand(

test/integration/client-side-encryption/driver.test.ts

@@ -115,59 +115,55 @@ describe('CSOT spec prose tests', function () {
     });
   });
 
-  context(
-    '2. maxTimeMS is not set for commands sent to mongocryptd',
-    { requires: { mongodb: '>=4.2' } },
-    () => {
-      /**
-       * This test MUST only be run against enterprise server versions 4.2 and higher.
-       *
-       * 1. Launch a mongocryptd process on 23000.
-       * 1. Create a MongoClient (referred to as `client`) using the URI `mongodb://localhost:23000/?timeoutMS=1000`.
-       * 1. Using `client`, execute the `{ ping: 1 }` command against the `admin` database.
-       * 1. Verify via command monitoring that the `ping` command sent did not contain a `maxTimeMS` field.
-       */
+  context('2. maxTimeMS is not set for commands sent to mongocryptd', () => {
+    /**
+     * This test MUST only be run against enterprise server versions 4.2 and higher.
+     *
+     * 1. Launch a mongocryptd process on 23000.
+     * 1. Create a MongoClient (referred to as `client`) using the URI `mongodb://localhost:23000/?timeoutMS=1000`.
+     * 1. Using `client`, execute the `{ ping: 1 }` command against the `admin` database.
+     * 1. Verify via command monitoring that the `ping` command sent did not contain a `maxTimeMS` field.
+     */
 
-      let client: MongoClient;
-      const mongocryptdTestPort = '23000';
-      let childProcess: ChildProcess;
+    let client: MongoClient;
+    const mongocryptdTestPort = '23000';
+    let childProcess: ChildProcess;
 
-      beforeEach(async function () {
-        const pidFile = path.join(os.tmpdir(), new ObjectId().toHexString());
-        childProcess = spawn(
-          'mongocryptd',
-          ['--port', mongocryptdTestPort, '--ipv6', '--pidfilepath', pidFile],
-          {
-            stdio: 'ignore',
-            detached: true
-          }
-        );
+    beforeEach(async function () {
+      const pidFile = path.join(os.tmpdir(), new ObjectId().toHexString());
+      childProcess = spawn(
+        'mongocryptd',
+        ['--port', mongocryptdTestPort, '--ipv6', '--pidfilepath', pidFile],
+        {
+          stdio: 'ignore',
+          detached: true
+        }
+      );
 
-        childProcess.on('error', error => console.warn(this.currentTest?.fullTitle(), error));
-        client = new MongoClient(`mongodb://localhost:${mongocryptdTestPort}/?timeoutMS=1000`, {
-          monitorCommands: true
-        });
+      childProcess.on('error', error => console.warn(this.currentTest?.fullTitle(), error));
+      client = new MongoClient(`mongodb://localhost:${mongocryptdTestPort}/?timeoutMS=1000`, {
+        monitorCommands: true
       });
+    });
 
-      afterEach(async function () {
-        await client.close();
-        childProcess.kill('SIGKILL');
-        sinon.restore();
-      });
+    afterEach(async function () {
+      await client.close();
+      childProcess.kill('SIGKILL');
+      sinon.restore();
+    });
 
-      it('maxTimeMS is not set', async function () {
-        const commandStarted = [];
-        client.on('commandStarted', ev => commandStarted.push(ev));
-        await client.connect();
-        await client
-          .db('admin')
-          .command({ ping: 1 })
-          .catch(e => squashError(e));
-        expect(commandStarted).to.have.lengthOf(1);
-        expect(commandStarted[0].command).to.not.have.property('maxTimeMS');
-      });
-    }
-  );
+    it('maxTimeMS is not set', async function () {
+      const commandStarted = [];
+      client.on('commandStarted', ev => commandStarted.push(ev));
+      await client.connect();
+      await client
+        .db('admin')
+        .command({ ping: 1 })
+        .catch(e => squashError(e));
+      expect(commandStarted).to.have.lengthOf(1);
+      expect(commandStarted[0].command).to.not.have.property('maxTimeMS');
+    });
+  });
 
   context('3. ClientEncryption', () => {
     /**