fixup: account for sinon fake timers

test/unit/assorted/polling_srv_records_for_mongos_discovery.prose.test.ts

@@ -10,6 +10,7 @@ import { HostAddress, isHello } from '../../../src/utils';
 import * as mock from '../../tools/mongodb-mock/index';
 import type { MockServer } from '../../tools/mongodb-mock/src/server';
 import { processTick } from '../../tools/utils';
+import { createTimerSandbox } from '../timer_sandbox';
 
 /*
     The SRV Prose Tests make use of the following REAL DNS records.
@@ -215,17 +216,20 @@ describe('Polling Srv Records for Mongos Discovery', () => {
     let lookupStub: sinon.SinonStub;
     let client: MongoClient;
     let clock: sinon.SinonFakeTimers;
+    let timerSandbox: sinon.SinonSandbox;
     const initialRecords = Object.freeze([
       { name: 'localhost.test.mock.test.build.10gen.cc', port: 2017 },
       { name: 'localhost.test.mock.test.build.10gen.cc', port: 2018 }
     ]);
 
     beforeEach(() => {
+      timerSandbox = createTimerSandbox();
       clock = sinon.useFakeTimers();
     });
 
     afterEach(() => {
       if (clock) {
+        timerSandbox.restore();
         clock.restore();
         clock = undefined;
       }

test/unit/cmap/connection.test.ts

@@ -11,6 +11,7 @@ import { MongoNetworkTimeoutError } from '../../../src/error';
 import { isHello, ns } from '../../../src/utils';
 import * as mock from '../../tools/mongodb-mock/index';
 import { getSymbolFrom } from '../../tools/utils';
+import { createTimerSandbox } from '../timer_sandbox';
 
 const connectionOptionsDefaults = {
   id: 0,
@@ -139,6 +140,7 @@ describe('new Connection()', function () {
   describe('onTimeout()', () => {
     let connection: sinon.SinonSpiedInstance<Connection>;
     let clock: sinon.SinonFakeTimers;
+    let timerSandbox: sinon.SinonFakeTimers;
     let driverSocket: sinon.SinonSpiedInstance<FakeSocket>;
     let messageStream: MessageStream;
     let kDelayedTimeoutId: symbol;
@@ -164,6 +166,7 @@ describe('new Connection()', function () {
     }
 
     beforeEach(() => {
+      timerSandbox = createTimerSandbox();
       clock = sinon.useFakeTimers();
 
       NodeJSTimeoutClass = setTimeout(() => null, 1).constructor;
@@ -177,6 +180,7 @@ describe('new Connection()', function () {
     });
 
     afterEach(() => {
+      timerSandbox.restore();
       clock.restore();
     });
 

test/unit/timer_sandbox.js

@@ -0,0 +1,22 @@
+'use strict';
+const sinon = require('sinon');
+
+/**
+ * sinon.useFakeTimers() only affects global methods, this function
+ * creates a sinon sandbox that ensures that require('timers')
+ * also uses the mocked variants.
+ *
+ * @returns {sinon.SinonSandbox}
+ */
+exports.createTimerSandbox = () => {
+  const timerSandbox = sinon.createSandbox();
+  const timers = require('timers');
+  for (const method in timers) {
+    if (method in global) {
+      timerSandbox.replace(timers, method, (...args) => {
+        return global[method](...args);
+      });
+    }
+  }
+  return timerSandbox;
+};

test/unit/utils.test.js

@@ -10,6 +10,7 @@ const { expect } = require('chai');
 const sinon = require('sinon');
 const { MongoRuntimeError } = require('../../src/error');
 const { LEGACY_HELLO_COMMAND } = require('../../src/constants');
+const { createTimerSandbox } = require('./timer_sandbox');
 
 describe('driver utils', function () {
   context('eachAsync()', function () {
@@ -44,9 +45,10 @@ describe('driver utils', function () {
   });
 
   describe('#makeInterruptibleAsyncInterval', function () {
-    let clock, executor, fnSpy;
+    let timerSandbox, clock, executor, fnSpy;
 
     beforeEach(function () {
+      timerSandbox = createTimerSandbox();
       clock = sinon.useFakeTimers();
       fnSpy = sinon.spy(cb => {
         cb();
@@ -58,6 +60,7 @@ describe('driver utils', function () {
         executor.stop();
       }
       clock.restore();
+      timerSandbox.restore();
     });
 
     context('when the immediate option is provided', function () {