fix tests?

Author: baileympearson

test/integration/crud/explain.test.ts

@@ -317,28 +317,30 @@ describe('CRUD API explain option', function () {
     }
 
     beforeEach(async function () {
-      client = this.configuration.newClient(
-        {},
-        { monitorCommands: true, minPoolSize: 5, appName: 'explain-tests' }
-      );
+      const uri = this.configuration.url({ useMultipleMongoses: false });
+      client = this.configuration.newClient(uri, { monitorCommands: true });
       client.on('commandStarted', filterForCommands('explain', commands));
 
-      waitUntilPoolsFilled(client, AbortSignal.timeout(30_000), 4);
-
-      await configureFailPoint(this.configuration, {
-        configureFailPoint: 'failCommand',
-        mode: { times: 1 },
-        data: {
-          failCommands: ['explain'],
-          blockConnection: true,
-          blockTimeMS: 1000,
-          appName: 'explain-tests'
-        }
-      });
+      await configureFailPoint(
+        this.configuration,
+        {
+          configureFailPoint: 'failCommand',
+          mode: { times: 1 },
+          data: {
+            failCommands: ['explain'],
+            blockConnection: true,
+            blockTimeMS: 1000
+          }
+        },
+        uri
+      );
     });
 
     afterEach(async function () {
-      await clearFailPoint(this.configuration);
+      await clearFailPoint(
+        this.configuration,
+        this.configuration.url({ useMultipleMongoses: false })
+      );
       await client?.close();
       commands.length = 0;
     });
@@ -535,6 +537,12 @@ describe('CRUD API explain option', function () {
           const { result, duration } = await measureDuration(() =>
             cursor.explain({ verbosity: 'queryPlanner' }).catch(e => e)
           );
+          const [
+            {
+              command: { maxTimeMS }
+            }
+          ] = commands;
+          expect(maxTimeMS).to.exist;
           expect(result).to.be.instanceOf(MongoOperationTimeoutError);
           expect(duration).to.be.within(1000 - 100, 1000 + 100);
         });
@@ -547,6 +555,12 @@ describe('CRUD API explain option', function () {
           const { result, duration } = await measureDuration(() =>
             cursor.explain({ verbosity: 'queryPlanner' }, { timeoutMS: 1000 }).catch(e => e)
           );
+          const [
+            {
+              command: { maxTimeMS }
+            }
+          ] = commands;
+          expect(maxTimeMS).to.exist;
           expect(result).to.be.instanceOf(MongoOperationTimeoutError);
           expect(duration).to.be.within(1000 - 100, 1000 + 100);
         });
@@ -558,6 +572,12 @@ describe('CRUD API explain option', function () {
           const { result, duration } = await measureDuration(() =>
             cursor.explain({ verbosity: 'queryPlanner' }, { timeoutMS: 1000 }).catch(e => e)
           );
+          const [
+            {
+              command: { maxTimeMS }
+            }
+          ] = commands;
+          expect(maxTimeMS).to.exist;
           expect(result).to.be.instanceOf(MongoOperationTimeoutError);
           expect(duration).to.be.within(1000 - 100, 1000 + 100);
         });
@@ -570,6 +590,12 @@ describe('CRUD API explain option', function () {
             cursor.explain({ verbosity: 'queryPlanner' }).catch(e => e)
           );
 
+          const [
+            {
+              command: { maxTimeMS }
+            }
+          ] = commands;
+          expect(maxTimeMS).to.exist;
           expect(result).to.be.instanceOf(MongoOperationTimeoutError);
           expect(duration).to.be.within(1000 - 100, 1000 + 100);
         });
@@ -581,7 +607,12 @@ describe('CRUD API explain option', function () {
           const { result, duration } = await measureDuration(() =>
             cursor.explain({ verbosity: 'queryPlanner' }, { timeoutMS: 1000 }).catch(e => e)
           );
-
+          const [
+            {
+              command: { maxTimeMS }
+            }
+          ] = commands;
+          expect(maxTimeMS).to.exist;
           expect(result).to.be.instanceOf(MongoOperationTimeoutError);
           expect(duration).to.be.within(1000 - 100, 1000 + 100);
         });
@@ -593,6 +624,12 @@ describe('CRUD API explain option', function () {
           const { duration, result } = await measureDuration(() =>
             cursor.explain({ verbosity: 'queryPlanner' }, { timeoutMS: 1000 }).catch(e => e)
           );
+          const [
+            {
+              command: { maxTimeMS }
+            }
+          ] = commands;
+          expect(maxTimeMS).to.exist;
           expect(duration).to.be.within(1000 - 100, 1000 + 100);
           expect(result).to.be.instanceOf(MongoOperationTimeoutError);
         });

test/tools/utils.ts

@@ -601,8 +601,12 @@ export async function waitUntilPoolsFilled(
   await Promise.all([wait$(), client.connect()]);
 }
 
-export async function configureFailPoint(configuration: TestConfiguration, failPoint: FailPoint) {
-  const utilClient = configuration.newClient();
+export async function configureFailPoint(
+  configuration: TestConfiguration,
+  failPoint: FailPoint,
+  uri = configuration.url()
+) {
+  const utilClient = configuration.newClient(uri);
   await utilClient.connect();
 
   try {
@@ -612,8 +616,8 @@ export async function configureFailPoint(configuration: TestConfiguration, failP
   }
 }
 
-export async function clearFailPoint(configuration: TestConfiguration) {
-  const utilClient = configuration.newClient();
+export async function clearFailPoint(configuration: TestConfiguration, url = configuration.url()) {
+  const utilClient = configuration.newClient(url);
   await utilClient.connect();
 
   try {