fix: more tests

Author: nbbeeken

test/integration/connection-monitoring-and-pooling/connection.test.ts

@@ -25,16 +25,16 @@ import { skipBrokenAuthTestBeforeEachHook } from '../../tools/runner/hooks/confi
 import { sleep } from '../../tools/utils';
 import { assert as test, setupDatabase } from '../shared';
 
-const commonConnectOptions = {
+const commonConnectOptions = client => ({
   id: 1,
   generation: 1,
   monitorCommands: false,
   tls: false,
   loadBalanced: false,
   // Will be overridden by configuration options
   hostAddress: HostAddress.fromString('127.0.0.1:1'),
-  authProviders: new MongoClientAuthProviders()
-};
+  authProviders: new MongoClientAuthProviders(client)
+});
 
 describe('Connection', function () {
   beforeEach(
@@ -50,21 +50,31 @@ describe('Connection', function () {
     return setupDatabase(this.configuration);
   });
 
+  let client;
+
+  beforeEach(async function () {
+    client = this.configuration.newClient();
+  });
+
+  afterEach(async function () {
+    await client.close();
+  });
+
   describe('Connection.command', function () {
     it('should execute a command against a server', {
       metadata: { requires: { apiVersion: false, topology: '!load-balanced' } },
       test: async function () {
         const connectOptions: ConnectionOptions = {
-          ...commonConnectOptions,
+          ...commonConnectOptions(client),
           connectionType: Connection,
           ...this.configuration.options,
           metadata: makeClientMetadata({ driverInfo: {} }),
-          extendedMetadata: addContainerMetadata(makeClientMetadata({ driverInfo: {} }))
+          extendedMetadata: addContainerMetadata(client, makeClientMetadata({ driverInfo: {} }))
         };
 
         let conn;
         try {
-          conn = await connect(connectOptions);
+          conn = await connect(client, connectOptions);
           const hello = await conn?.command(ns('admin.$cmd'), { [LEGACY_HELLO_COMMAND]: 1 });
           expect(hello).to.have.property('ok', 1);
         } finally {
@@ -77,17 +87,17 @@ describe('Connection', function () {
       metadata: { requires: { apiVersion: false, topology: '!load-balanced' } },
       test: async function () {
         const connectOptions: ConnectionOptions = {
-          ...commonConnectOptions,
+          ...commonConnectOptions(client),
           connectionType: Connection,
           ...this.configuration.options,
           monitorCommands: true,
           metadata: makeClientMetadata({ driverInfo: {} }),
-          extendedMetadata: addContainerMetadata(makeClientMetadata({ driverInfo: {} }))
+          extendedMetadata: addContainerMetadata(client, makeClientMetadata({ driverInfo: {} }))
         };
 
         let conn;
         try {
-          conn = await connect(connectOptions);
+          conn = await connect(client, connectOptions);
 
           const events: any[] = [];
           conn.on('commandStarted', event => events.push(event));
@@ -109,17 +119,17 @@ describe('Connection', function () {
       metadata: { requires: { apiVersion: false, topology: '!load-balanced' } },
       test: async function () {
         const connectOptions: ConnectionOptions = {
-          ...commonConnectOptions,
+          ...commonConnectOptions(client),
           connectionType: Connection,
           ...this.configuration.options,
           monitorCommands: true,
           metadata: makeClientMetadata({ driverInfo: {} }),
-          extendedMetadata: addContainerMetadata(makeClientMetadata({ driverInfo: {} }))
+          extendedMetadata: addContainerMetadata(client, makeClientMetadata({ driverInfo: {} }))
         };
 
         let conn;
         try {
-          conn = await connect(connectOptions);
+          conn = await connect(client, connectOptions);
 
           const toObjectSpy = sinon.spy(MongoDBResponse.prototype, 'toObject');
 

test/integration/node-specific/client_close.test.ts

@@ -596,7 +596,7 @@ describe('MongoClient.close() Integration', () => {
             await runScriptAndGetProcessInfo(
               'tls-file-read-auto-encryption',
               this.configuration,
-              async function run({ MongoClient, uri, expect, mongodb }) {
+              async function run({ MongoClient, uri, expect, mongodb, getCSFLEKMSProviders }) {
                 const infiniteFile = '/dev/zero';
 
                 const kmsProviders = getCSFLEKMSProviders();

test/integration/node-specific/resource_tracking_script_builder.ts

@@ -32,6 +32,7 @@ export type ProcessResourceTestFunction = (options: {
   timers?: typeof timers;
   getSocketReport?: () => { host: string; port: string };
   getSocketEndpointReport?: () => any;
+  getCSFLEKMSProviders: () => Record<string, any>;
   once?: () => typeof once;
 }) => Promise<void>;
 

test/tools/cmap_spec_runner.ts

@@ -377,7 +377,10 @@ async function runCmapTest(test: CmapTest, threadContext: ThreadContext) {
   }
 
   const metadata = makeClientMetadata({ appName: poolOptions.appName, driverInfo: {} });
-  const extendedMetadata = addContainerMetadata(metadata);
+  const extendedMetadata = addContainerMetadata(
+    { io: { fs: { readFile: async () => Buffer.alloc(0), access: async () => false } } },
+    metadata
+  );
   delete poolOptions.appName;
 
   const operations = test.operations;

test/tools/fixtures/process_resource_script.in.js

@@ -16,6 +16,7 @@ const { expect } = require('chai');
 const timers = require('node:timers');
 const { setTimeout } = timers;
 const { once } = require('node:events');
+const { getCSFLEKMSProviders } = require('../../csfle-kms-providers');
 
 let originalReport;
 const logFile = scriptName + '.logs.txt';
@@ -121,6 +122,7 @@ async function main() {
     getTimerCount,
     getSockets,
     getSocketEndpoints,
+    getCSFLEKMSProviders,
     once
   });
   log({ newResources: getNewResources() });