fix: pr feedback

Author: PavelSafronov

test/unit/cmap/connect.test.ts

@@ -1,11 +1,10 @@
-import { type ConnectionOptions } from 'node:tls';
 
 import { type Document } from 'bson';
 import { expect } from 'chai';
 
 import { MongoCredentials } from '../../../src/cmap/auth/mongo_credentials';
 import { connect, prepareHandshakeDocument } from '../../../src/cmap/connect';
-import { type Connection } from '../../../src/cmap/connection';
+import { ConnectionOptions, type Connection } from '../../../src/cmap/connection';
 import {
   addContainerMetadata,
   type ClientMetadata
@@ -181,15 +180,13 @@ describe('Connect Tests', function () {
   });
 
   it('should emit `MongoNetworkError` for network errors', async function () {
-    try {
-      await connect({
-        hostAddress: new HostAddress('non-existent:27018')
-      });
-    } catch (error) {
-      expect(error).to.be.instanceOf(MongoNetworkError);
-    }
+    const error = await connect({
+      hostAddress: new HostAddress('non-existent:27018')
+    }).catch(e => e);
+    expect(error).to.be.instanceOf(MongoNetworkError);
   });
 
+
   describe('prepareHandshakeDocument', () => {
     describe('client environment (containers and FAAS)', () => {
       const cachedEnv = process.env;

test/unit/collection.test.ts

@@ -54,6 +54,7 @@ describe('Collection', function () {
         }
       ];
       await collection.aggregate(pipeline, options).next();
+      await client.close();
     }
 
     context('bypass document validation', () => {
@@ -80,12 +81,12 @@ describe('Collection', function () {
           });
         }
 
-        if (isHello(doc)) {
-          request.reply(Object.assign({}, HELLO));
-        } else if (doc.endSessions) {
-          request.reply({ ok: 1 });
-        }
-      });
+          if (isHello(doc)) {
+            request.reply(Object.assign({}, HELLO));
+          } else if (doc.endSessions) {
+            request.reply({ ok: 1 });
+          }
+        });
 
       await client.connect();
       const db = client.db('test');
@@ -94,6 +95,7 @@ describe('Collection', function () {
       const options = { bypassDocumentValidation: config.actual };
 
       await collection.findOneAndUpdate({ name: 'Andy' }, { $inc: { score: 1 } }, options);
+      await client.close();
     }
 
     it('should only set bypass document validation if strictly true in findOneAndUpdate', async function () {
@@ -118,12 +120,12 @@ describe('Collection', function () {
           });
         }
 
-        if (isHello(doc)) {
-          request.reply(Object.assign({}, HELLO));
-        } else if (doc.endSessions) {
-          request.reply({ ok: 1 });
-        }
-      });
+          if (isHello(doc)) {
+            request.reply(Object.assign({}, HELLO));
+          } else if (doc.endSessions) {
+            request.reply({ ok: 1 });
+          }
+        });
 
       await client.connect();
       const db = client.db('test');
@@ -135,6 +137,7 @@ describe('Collection', function () {
       };
 
       await collection.bulkWrite([{ insertOne: { document: { a: 1 } } }], options);
+      await client.close();
     }
 
     // ordered bulk write, testing change in ordered.js

test/unit/sdam/topology.test.ts

@@ -115,19 +115,16 @@ describe('Topology (unit)', function () {
         serverSelectionTimeoutMS: 0,
         socketTimeoutMS: 250
       });
-      const server = await topology.selectServer('primary', {
-        timeoutContext: ctx,
-        operationName: 'none'
-      });
-      try {
-        await server.command(new RunCursorCommandOperation(ns('admin.$cmd'), { ping: 1 }, {}), ctx);
-        expect.fail('expected command to fail');
-      } catch (err) {
-        expect(err).to.exist;
-        expect(err).to.match(/timed out/);
-      } finally {
-        topology.close();
-      }
+      const server = await topology
+        .selectServer('primary', {
+          timeoutContext: ctx, operationName: 'none'
+        });
+      const err = await server
+        .command(new RunCursorCommandOperation(ns('admin.$cmd'), { ping: 1 }, {}), ctx)
+        .catch(e => e);
+      expect(err).to.exist;
+      expect(err).to.match(/timed out/);
+      topology.close();
     });
   });