fix tests

Author: W-A-James

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

@@ -207,12 +207,11 @@ describe('Server Discovery and Monitoring (spec)', function () {
         topologySelectServers = sinon
           .stub(Topology.prototype, 'selectServer')
 
-          .callsFake(function (selector, options, callback) {
+          .callsFake(function (selector, options) {
             topologySelectServers.restore();
 
             const fakeServer = { s: { state: 'connected' }, removeListener: () => true };
-            // @ts-expect-error: stub doesn't need to be a full server
-            callback(undefined, fakeServer);
+            return Promise.resolve(fakeServer);
           });
       });
 

test/unit/assorted/server_selection_latency_window_utils.ts

@@ -139,10 +139,7 @@ export async function runServerSelectionLatencyWindowTest(test: ServerSelectionL
   const selectedServers: Server[] = [];
 
   for (let i = 0; i < test.iterations; ++i) {
-    const server: Server = await promisify(topology.selectServer.bind(topology))(
-      ReadPreference.NEAREST,
-      {}
-    );
+    const server: Server = await topology.selectServer.bind(topology)(ReadPreference.NEAREST, {});
     selectedServers.push(server);
   }
 

test/unit/assorted/server_selection_spec_helper.js

@@ -102,11 +102,11 @@ function executeServerSelectionTest(testDefinition, testDone) {
   // call to `selectServers` call a fake, and then immediately restore the original behavior.
   let topologySelectServers = sinon
     .stub(Topology.prototype, 'selectServer')
-    .callsFake(function (selector, options, callback) {
+    .callsFake(function (selector, options) {
       topologySelectServers.restore();
 
       const fakeServer = { s: { state: 'connected' }, removeListener: () => {} };
-      callback(undefined, fakeServer);
+      return Promise.resolve(fakeServer);
     });
 
   function done(err) {
@@ -149,56 +149,54 @@ function executeServerSelectionTest(testDefinition, testDone) {
     }
 
     // default to serverSelectionTimeoutMS of `100` for unit tests
-    topology.selectServer(selector, { serverSelectionTimeoutMS: 50 }, (err, server) => {
-      // are we expecting an error?
-      if (testDefinition.error) {
-        if (!err) {
-          return done(new Error('Expected an error, but found none!'));
+    topology.selectServer(selector, { serverSelectionTimeoutMS: 50 }).then(
+      server => {
+        if (testDefinition.error) return done(new Error('Expected an error, but found none!'));
+        if (expectedServers.length === 0 && server !== null) {
+          return done(new Error('Found server, but expected none!'));
         }
 
-        return done();
-      }
-
-      if (err) {
-        // this is another expected error case
-        if (expectedServers.length === 0 && err instanceof MongoServerSelectionError) return done();
-        return done(err);
-      }
+        const selectedServerDescription = server.description;
 
-      if (expectedServers.length === 0 && server !== null) {
-        return done(new Error('Found server, but expected none!'));
-      }
+        try {
+          const expectedServerArray = expectedServers.filter(
+            s => s.address === selectedServerDescription.address
+          );
 
-      const selectedServerDescription = server.description;
+          if (!expectedServerArray.length) {
+            return done(new Error('No suitable servers found!'));
+          }
 
-      try {
-        const expectedServerArray = expectedServers.filter(
-          s => s.address === selectedServerDescription.address
-        );
+          if (expectedServerArray.length > 1) {
+            return done(new Error('This test does not support multiple expected servers'));
+          }
 
-        if (!expectedServerArray.length) {
-          return done(new Error('No suitable servers found!'));
+          for (const [prop, value] of Object.entries(expectedServerArray[0])) {
+            if (prop === 'hosts') {
+              // we dynamically modify this prop during sever selection
+              continue;
+            }
+            expect(selectedServerDescription[prop]).to.deep.equal(
+              value,
+              `Mismatched selected server "${prop}"`
+            );
+          }
+          done();
+        } catch (e) {
+          done(e);
         }
-
-        if (expectedServerArray.length > 1) {
-          return done(new Error('This test does not support multiple expected servers'));
+      },
+      err => {
+        // are we expecting an error?
+        if (testDefinition.error) {
+          return done();
         }
 
-        for (const [prop, value] of Object.entries(expectedServerArray[0])) {
-          if (prop === 'hosts') {
-            // we dynamically modify this prop during sever selection
-            continue;
-          }
-          expect(selectedServerDescription[prop]).to.deep.equal(
-            value,
-            `Mismatched selected server "${prop}"`
-          );
-        }
-        done();
-      } catch (e) {
-        done(e);
+        // this is another expected error case
+        if (expectedServers.length === 0 && err instanceof MongoServerSelectionError) return done();
+        return done(err);
       }
-    });
+    );
   });
 }
 

test/unit/error.test.ts

@@ -368,9 +368,7 @@ describe('MongoErrors', () => {
           return cleanup(err);
         }
 
-        topology.selectServer('primary', {}, (err, server) => {
-          expect(err).to.not.exist;
-
+        topology.selectServer('primary', {}).then(server => {
           server
             .command(ns('db1'), Object.assign({}, RAW_USER_WRITE_CONCERN_CMD), {})
             .then(expect.fail, err => {
@@ -389,7 +387,7 @@ describe('MongoErrors', () => {
                 cleanup(_err);
               }
             });
-        });
+        }, expect.fail);
       });
     });
 
@@ -414,9 +412,7 @@ describe('MongoErrors', () => {
           return cleanup(err);
         }
 
-        topology.selectServer('primary', {}, (err, server) => {
-          expect(err).to.not.exist;
-
+        topology.selectServer('primary', {}).then(server => {
           server
             .command(ns('db1'), Object.assign({}, RAW_USER_WRITE_CONCERN_CMD), {})
             .then(expect.fail, err => {
@@ -433,7 +429,7 @@ describe('MongoErrors', () => {
                 cleanup(_err);
               }
             });
-        });
+        }, expect.fail);
       });
     });
   });

test/unit/sdam/server_selection.test.ts

@@ -628,19 +628,19 @@ describe('server selection', async function () {
     context('when willLog returns false', function () {
       const original = Object.getPrototypeOf(ServerSelectionEvent);
       let serverSelectionEventStub;
-      beforeEach(async () => {
+      beforeEach(() => {
         sinon.stub(MongoLogger.prototype, 'willLog').callsFake((_v, _w) => false);
         serverSelectionEventStub = sinon.stub();
         Object.setPrototypeOf(ServerSelectionEvent, serverSelectionEventStub);
       });
 
-      afterEach(async () => {
+      afterEach(() => {
         sinon.restore();
         Object.setPrototypeOf(ServerSelectionEvent, original);
       });
 
-      it('should not create server selection event instances', function () {
-        topology?.selectServer(topologyDescription, { operationName: 'test' }, v => v);
+      it('should not create server selection event instances', async function () {
+        await topology?.selectServer(topologyDescription, { operationName: 'test' });
         expect(serverSelectionEventStub.getCall(0)).to.be.null;
       });
     });