chore: fix leaky cursors tests

Author: nbbeeken

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

@@ -16,6 +16,7 @@ import {
   FindCursor,
   ListCollectionsCursor,
   type Log,
+  Long,
   type MongoClient,
   MongoServerError,
   promiseWithResolvers,
@@ -52,9 +53,11 @@ describe('AbortSignal support', () => {
   let db: Db;
   let collection: Collection<{ a: number; ssn: string }>;
   const logs: Log[] = [];
+  const cursors = [];
 
   beforeEach(async function () {
     logs.length = 0;
+    cursors.length = 0;
 
     client = this.configuration.newClient(
       {},
@@ -70,17 +73,34 @@ describe('AbortSignal support', () => {
     await client.connect();
     db = client.db('abortSignal');
     collection = db.collection('support');
+
+    client.on('commandSucceeded', ev => {
+      if (
+        ev.commandName === 'find' ||
+        ev.commandName === 'aggregate' ||
+        ev.commandName === 'listCollections'
+      ) {
+        const cursorId = Long.isLong(ev.reply.cursor.id)
+          ? ev.reply.cursor.id
+          : Long.fromNumber(ev.reply.cursor.id);
+
+        if (!Long.ZERO.equals(cursorId)) {
+          cursors.push(cursorId);
+        }
+      }
+    });
   });
 
   afterEach(async function () {
     logs.length = 0;
     const utilClient = this.configuration.newClient();
     try {
+      await utilClient.db('abortSignal').command({ killCursors: 'support', cursors });
       await utilClient.db('abortSignal').collection('support').deleteMany({});
     } finally {
       await utilClient.close();
+      await client?.close();
     }
-    await client?.close();
   });
 
   function testCursor(cursorName: string, constructor: any) {

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

@@ -7,6 +7,7 @@ import {
   type ChangeStream,
   ClientSession,
   type Collection,
+  Long,
   MongoClient,
   MongoNotConnectedError,
   ProfilingLevel,
@@ -19,7 +20,7 @@ describe('When executing an operation for the first time', () => {
   let client: MongoClient;
 
   beforeEach('create client', async function () {
-    client = this.configuration.newClient();
+    client = this.configuration.newClient({}, { monitorCommands: true });
   });
 
   beforeEach('create test namespace', async function () {
@@ -212,26 +213,38 @@ describe('When executing an operation for the first time', () => {
     let changeCausingCollection: Collection;
     let collection: Collection;
     let cs: ChangeStream;
+    const cursors = [];
 
     beforeEach(async function () {
+      cursors.length = 0;
+
       if (this.configuration.topologyType === TopologyType.Single) {
         return;
       }
       changeCausingClient = this.configuration.newClient();
-      await changeCausingClient
+      changeCausingCollection = await changeCausingClient
         .db('auto-connect-change')
         .createCollection('auto-connect')
         .catch(() => null);
 
-      changeCausingCollection = changeCausingClient
-        .db('auto-connect-change')
-        .collection('auto-connect');
-
       collection = client.db('auto-connect-change').collection('auto-connect');
       cs = collection.watch();
+
+      client.on('commandSucceeded', ev => {
+        if (ev.commandName === 'aggregate') {
+          const cursorId = Long.isLong(ev.reply.cursor.id)
+            ? ev.reply.cursor.id
+            : Long.fromNumber(ev.reply.cursor.id);
+
+          if (!Long.ZERO.equals(cursorId)) {
+            cursors.push(cursorId);
+          }
+        }
+      });
     });
 
     afterEach(async function () {
+      await client.db('auto-connect-change').command({ killCursors: 'auto-connect', cursors });
       await changeCausingClient?.close();
       await cs?.close();
     });

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

@@ -755,13 +755,7 @@ describe('MongoClient.close() Integration', () => {
             );
           };
 
-          cursor = coll.find(
-            {},
-            {
-              tailable: true,
-              awaitData: true
-            }
-          );
+          cursor = coll.find({}, { batchSize: 1 });
           await cursor.next();
 
           // assert creation