chore: filter on ns

Author: nbbeeken

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

@@ -16,7 +16,6 @@ import {
   FindCursor,
   ListCollectionsCursor,
   type Log,
-  Long,
   type MongoClient,
   MongoServerError,
   promiseWithResolvers,
@@ -53,11 +52,9 @@ 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(
       {},
@@ -73,37 +70,17 @@ 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 {
-      if (cursors.length) {
-        await utilClient.db('abortSignal').command({ killCursors: 'support', cursors });
-        cursors.length = 0;
-      }
       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,7 +7,6 @@ import {
   type ChangeStream,
   ClientSession,
   type Collection,
-  Long,
   MongoClient,
   MongoNotConnectedError,
   ProfilingLevel,
@@ -20,7 +19,7 @@ describe('When executing an operation for the first time', () => {
   let client: MongoClient;
 
   beforeEach('create client', async function () {
-    client = this.configuration.newClient({}, { monitorCommands: true });
+    client = this.configuration.newClient();
   });
 
   beforeEach('create test namespace', async function () {
@@ -213,16 +212,13 @@ 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();
-      changeCausingCollection = await changeCausingClient
+      await changeCausingClient
         .db('auto-connect-change')
         .createCollection('auto-connect')
         .catch(() => null);
@@ -233,25 +229,9 @@ describe('When executing an operation for the first time', () => {
 
       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 () {
-      if (cursors.length) {
-        await client.db('auto-connect-change').command({ killCursors: 'auto-connect', cursors });
-        cursors.length = 0;
-      }
       await changeCausingClient?.close();
       await cs?.close();
     });

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

@@ -648,11 +648,11 @@ describe('MongoClient.close() Integration', () => {
         utilClient = this.configuration.newClient();
         await client.connect();
         await client
-          .db('db')
-          .collection('coll')
+          .db('close_db')
+          .collection('close_coll')
           .drop()
           .catch(() => null);
-        coll = await client.db('db').createCollection('coll');
+        coll = await client.db('close_db').createCollection('close_coll');
         await coll.insertMany([{ a: 1 }, { b: 2 }, { c: 3 }]);
       });
 
@@ -672,11 +672,7 @@ describe('MongoClient.close() Integration', () => {
               .aggregate([{ $currentOp: { idleCursors: true } }])
               .toArray();
 
-            return cursors.filter(
-              c =>
-                c.ns !== 'local.oplog.rs' &&
-                (c.type === 'idleCursor' || (c.type === 'op' && c.desc === 'getMore'))
-            ); // all idle cursors
+            return cursors.filter(c => c.ns === 'close_db.close_coll');
           };
 
           cursor = coll.find({}, { batchSize: 1 });