fix unit

Author: nbbeeken

test/unit/assorted/server_discovery_and_monitoring.spec.test.ts

@@ -215,7 +215,14 @@ describe('Server Discovery and Monitoring (spec)', function () {
           .callsFake(async function (_selector, _options) {
             topologySelectServers.restore();
 
-            const fakeServer = { s: { state: 'connected' }, removeListener: () => true };
+            const fakeServer = {
+              s: { state: 'connected' },
+              removeListener: () => true,
+              pool: {
+                checkOut: async () => ({}),
+                checkIn: () => undefined
+              }
+            };
             return fakeServer;
           });
       });

test/unit/assorted/server_discovery_and_monitoring.test.ts

@@ -31,7 +31,14 @@ describe('Server Discovery and Monitoring', function () {
       .callsFake(async function (_selector, _options) {
         topologySelectServer.restore();
 
-        const fakeServer = { s: { state: 'connected' }, removeListener: () => true };
+        const fakeServer = {
+          s: { state: 'connected' },
+          removeListener: () => true,
+          pool: {
+            checkOut: async () => ({}),
+            checkIn: () => undefined
+          }
+        };
         return fakeServer;
       });
 

test/unit/assorted/server_selection_spec_helper.js

@@ -106,7 +106,14 @@ export async function executeServerSelectionTest(testDefinition) {
     .callsFake(async function () {
       topologySelectServers.restore();
 
-      const fakeServer = { s: { state: 'connected' }, removeListener: () => {} };
+      const fakeServer = {
+        s: { state: 'connected' },
+        removeListener: () => true,
+        pool: {
+          checkOut: async () => ({}),
+          checkIn: () => undefined
+        }
+      };
       return fakeServer;
     });
 

test/unit/sdam/topology.test.ts

@@ -25,6 +25,7 @@ import { Topology } from '../../../src/sdam/topology';
 import { TopologyDescription } from '../../../src/sdam/topology_description';
 import { TimeoutContext } from '../../../src/timeout';
 import { isHello, ns } from '../../../src/utils';
+import { ConnectionPool } from '../../mongodb';
 import * as mock from '../../tools/mongodb-mock/index';
 import { topologyWithPlaceholderClient } from '../../tools/utils';
 
@@ -444,31 +445,23 @@ describe('Topology (unit)', function () {
 
   describe('selectServer()', function () {
     it('should schedule monitoring if no suitable server is found', async function () {
-      const topology = topologyWithPlaceholderClient('someserver:27019', {});
+      const topology = topologyWithPlaceholderClient(
+        'someserver:27019',
+        {},
+        { serverSelectionTimeoutMS: 10 }
+      );
       const requestCheck = sinon.stub(Server.prototype, 'requestCheck');
 
-      // satisfy the initial connect, then restore the original method
-      const selectServer = sinon
-        .stub(Topology.prototype, 'selectServer')
-        .callsFake(async function () {
-          const server = Array.from(this.s.servers.values())[0];
-          selectServer.restore();
-          return server;
-        });
-
       sinon.stub(Server.prototype, 'connect').callsFake(function () {
         this.s.state = 'connected';
         this.emit('connect');
         return;
       });
 
-      await topology.connect();
-      const err = await topology
-        .selectServer(ReadPreference.secondary, { serverSelectionTimeoutMS: 1000 })
-        .then(
-          () => null,
-          e => e
-        );
+      const err = await topology.connect().then(
+        () => null,
+        e => e
+      );
       expect(err).to.match(/Server selection timed out/);
       expect(err).to.have.property('reason');
       // When server is created `connect` is called on the monitor. When server selection
@@ -516,12 +509,20 @@ describe('Topology (unit)', function () {
           this.emit('connect');
         });
 
+        sinon.stub(ConnectionPool.prototype, 'checkOut').callsFake(async function () {
+          return {};
+        });
+
+        sinon.stub(ConnectionPool.prototype, 'checkIn').callsFake(function (_) {
+          return;
+        });
+
         const toSelect = 10;
         let completed = 0;
         // methodology:
         //   - perform 9 server selections, a few with a selector that throws an error
         //   - ensure each selection immediately returns an empty result (gated by a boolean)
-        //     guaranteeing tha the queue will be full before the last selection
+        //     guaranteeing that the queue will be full before the last selection
         //   - make one last selection, but ensure that all selections are no longer blocked from
         //     returning their value
         //   - verify that 10 callbacks were called