Undo accidental changes

mongodb · Oct 3, 2022 · e5975d0 · e5975d0
1 parent bcfe1c2
commit e5975d0
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 23 deletions.
diff --git a/test/integration/change-streams/change_stream.test.ts b/test/integration/change-streams/change_stream.test.ts
@@ -5,7 +5,7 @@ import { gte, lt } from 'semver';
 import * as sinon from 'sinon';
 import { PassThrough } from 'stream';
 import { setTimeout } from 'timers';
-import { inspect, promisify } from 'util';
+import { promisify } from 'util';
 
 import {
   AbstractCursor,

diff --git a/test/unit/sdam/monitor.test.ts b/test/unit/sdam/monitor.test.ts
@@ -400,41 +400,71 @@ describe('monitoring', function () {
         });
       });
 
-      context('when it has been < minHeartbeatFrequencyMS since fn() last completed', function () {
+      context(
+        'when it has been < minHeartbeatFrequencyMS and >= 0 since fn() last completed',
+        function () {
+          beforeEach(function () {
+            executor = new MonitorInterval(fnSpy, {
+              minHeartbeatFrequencyMS: 10,
+              heartbeatFrequencyMS: 30
+            });
+
+            // call fn() once
+            clock.tick(30);
+            expect(fnSpy.calledOnce).to.be.true;
+
+            fnSpy.callCount = 0;
+
+            // advance less than minHeartbeatFrequency
+            clock.tick(5);
+
+            executor.wake();
+          });
+
+          it('reschedules fn() to minHeartbeatFrequencyMS after the last call', function () {
+            expect(fnSpy.callCount).to.equal(0);
+            clock.tick(5);
+            expect(fnSpy.calledOnce).to.be.true;
+          });
+
+          context('when wake() is called more than once', function () {
+            it('schedules fn() minHeartbeatFrequencyMS after the last call to fn()', function () {
+              executor.wake();
+              executor.wake();
+              executor.wake();
+
+              expect(fnSpy.callCount).to.equal(0);
+              clock.tick(5);
+              expect(fnSpy.calledOnce).to.be.true;
+            });
+          });
+        }
+      );
+
+      context('when it has been <0 since fn() has last executed', function () {
         beforeEach(function () {
           executor = new MonitorInterval(fnSpy, {
             minHeartbeatFrequencyMS: 10,
             heartbeatFrequencyMS: 30
           });
 
-          // call fn() once
-          clock.tick(30);
-          expect(fnSpy.calledOnce).to.be.true;
-
-          fnSpy.callCount = 0;
-
-          // advance less than minHeartbeatFrequency
-          clock.tick(5);
-
+          // negative ticks aren't supported, so manually set execution time
+          executor.lastExecutionEnded = Infinity;
           executor.wake();
         });
 
-        it('reschedules fn() to minHeartbeatFrequencyMS after the last call', function () {
-          expect(fnSpy.callCount).to.equal(0);
-          clock.tick(5);
+        it('executes fn() immediately', function () {
           expect(fnSpy.calledOnce).to.be.true;
         });
 
-        context('when wake() is called more than once', function () {
-          it('schedules fn() minHeartbeatFrequencyMS after the last call to fn()', function () {
-            executor.wake();
-            executor.wake();
-            executor.wake();
+        it('reschedules fn() to minHeartbeatFrequency away', function () {
+          fnSpy.callCount = 0;
 
-            expect(fnSpy.callCount).to.equal(0);
-            clock.tick(5);
-            expect(fnSpy.calledOnce).to.be.true;
-          });
+          clock.tick(29);
+          expect(fnSpy.callCount).to.equal(0);
+
+          clock.tick(1);
+          expect(fnSpy.calledOnce).to.be.true;
         });
       });
     });