test(NODE-4642): fix serverApi strict tests (#3436)

* test(NODE-4642): fix serverApi strict tests

* fix: evg gen

Author: nbbeeken

.evergreen/config.yml

@@ -1185,6 +1185,9 @@ tasks:
           REQUIRE_API_VERSION: '1'
           AUTH: auth
       - func: bootstrap kms servers
+      - func: run tests
+        vars:
+          MONGODB_API_VERSION: '1'
   - name: test-atlas-connectivity
     tags:
       - atlas-connect

.evergreen/generate_evergreen_tasks.js

@@ -97,13 +97,12 @@ BASE_TASKS.push({
       }
     },
     { func: 'bootstrap kms servers' },
-    // TODO(NODE-4642): Fix versioned API tests
-    // {
-    //   func: 'run tests',
-    //   vars: {
-    //     MONGODB_API_VERSION: '1'
-    //   }
-    // }
+    {
+      func: 'run tests',
+      vars: {
+        MONGODB_API_VERSION: '1'
+      }
+    }
   ]
 });
 

test/tools/cmap_spec_runner.ts

@@ -299,7 +299,10 @@ export class ThreadContext {
     this.pool = new ConnectionPool(this.#server, {
       ...this.#poolOptions,
       ...options,
-      hostAddress: this.#hostAddress
+      hostAddress: this.#hostAddress,
+      serverApi: process.env.MONGODB_API_VERSION
+        ? { version: process.env.MONGODB_API_VERSION }
+        : undefined
     });
     this.#originalServerPool = this.#server.s.pool;
     this.#server.s.pool = this.pool;
@@ -370,8 +373,6 @@ async function runCmapTest(test: CmapTest, threadContext: ThreadContext) {
   const expectedEvents = test.events;
   const ignoreEvents = test.ignore || [];
 
-  let actualError;
-
   const MAIN_THREAD_KEY = Symbol('Main Thread');
   const mainThread = threadContext.getThread(MAIN_THREAD_KEY);
   mainThread.start();
@@ -394,9 +395,7 @@ async function runCmapTest(test: CmapTest, threadContext: ThreadContext) {
     }
   }
 
-  await mainThread.finish().catch(e => {
-    actualError = e;
-  });
+  const actualError = await mainThread.finish().catch(e => e);
 
   if (expectedError) {
     expect(actualError).to.exist;

test/tools/runner/config.ts

@@ -199,10 +199,6 @@ export class TestConfiguration {
       dbOptions.loadBalanced = true;
     }
 
-    if (process.env.MONGODB_API_VERSION) {
-      dbOptions.apiVersion = process.env.MONGODB_API_VERSION;
-    }
-
     const urlOptions: url.UrlObject = {
       protocol: this.isServerless ? 'mongodb+srv' : 'mongodb',
       slashes: true,