wip

Author: nbbeeken

src/mongo_client.ts

@@ -1,8 +1,6 @@
 import type { TcpNetConnectOpts } from 'net';
 import type { ConnectionOptions as TLSConnectionOptions, TLSSocketOptions } from 'tls';
-import { promisify } from 'util';
 
-import { Admin } from './admin';
 import { BSONSerializeOptions, Document, resolveBSONOptions } from './bson';
 import { ChangeStream, ChangeStreamDocument, ChangeStreamOptions } from './change_stream';
 import type { AuthMechanismProperties, MongoCredentials } from './cmap/auth/mongo_credentials';

src/sdam/topology.ts

@@ -32,7 +32,7 @@ import {
 import type { MongoClient, ServerApi } from '../mongo_client';
 import { TypedEventEmitter } from '../mongo_types';
 import { ReadPreference, ReadPreferenceLike } from '../read_preference';
-import type { ClientSession, ServerSessionId } from '../sessions';
+import type { ClientSession } from '../sessions';
 import type { Transaction } from '../transactions';
 import {
   Callback,

src/sessions.ts

@@ -27,7 +27,6 @@ import { PromiseProvider } from './promise_provider';
 import { ReadConcernLevel } from './read_concern';
 import { ReadPreference } from './read_preference';
 import { _advanceClusterTime, ClusterTime, TopologyType } from './sdam/common';
-import type { Topology } from './sdam/topology';
 import { isTransactionCommand, Transaction, TransactionOptions, TxnState } from './transactions';
 import {
   calculateDurationInMs,

test/integration/auth/scram_sha_1.test.ts

@@ -19,7 +19,7 @@ describe('SCRAM-SHA-1', function () {
   });
 
   afterEach(async () => {
-    await client.close();
+    await client?.close();
   });
 
   it('successfuly authenticates', async () => {

test/integration/collection-management/collection.test.ts

@@ -542,10 +542,6 @@ describe('Collection', function () {
       await collection.insertOne({ a: 'c' });
     });
 
-    afterEach(async function () {
-      await client.close();
-    });
-
     afterEach(async function () {
       await collection.drop();
       await client.close();

test/integration/crud/find_cursor_methods.test.js

@@ -213,7 +213,7 @@ describe('Find Cursor', function () {
     });
   });
 
-  context('#rewind', function () {
+  context.skip('#rewind', function () {
     it('should rewind a cursor', function (done) {
       const coll = client.db().collection('abstract_cursor');
       const cursor = coll.find({});

test/tools/runner/hooks/session_leak_checker.ts

@@ -17,7 +17,7 @@ ServerSessionPool.prototype.release = function (...args) {
   return originalRelease.call(this, ...args);
 };
 
-const sessionLeakCheckBeforeEach: Mocha.Func = function sessionLeakCheckBeforeEach() {
+const sessionLeakCheckBeforeEach: Mocha.Func = async function sessionLeakCheckBeforeEach() {
   if (this.currentTest?.metadata?.sessions?.skipLeakTests) {
     return;
   }
@@ -27,14 +27,18 @@ const sessionLeakCheckBeforeEach: Mocha.Func = function sessionLeakCheckBeforeEa
   releaseCount = 0;
 };
 
-const sessionLeakCheckAfterEach: Mocha.Func = function sessionLeakCheckAfterEach() {
+const sessionLeakCheckAfterEach: Mocha.Func = async function sessionLeakCheckAfterEach() {
   if (this.currentTest?.state === 'failed' || this.currentTest?.metadata?.sessions?.skipLeakTests) {
     return;
   }
 
   const title = this.currentTest.fullTitle();
-
-  expect(acquireCount, `"${title}" failed to release all sessions`).to.equal(releaseCount);
+  try {
+    expect(acquireCount, `"${title}" failed to release all sessions`).to.equal(releaseCount);
+  } catch (error) {
+    // @ts-expect-error: internal mocha api
+    this.test.error(error);
+  }
 };
 
 module.exports = {