tests: update for timers unref optimization

Author: Fishrock123

test/parallel/test-handle-wrap-isrefed.js

@@ -91,11 +91,13 @@ function makeAssert(message) {
 {
   const assert = makeAssert('hasRef() not working on timer_wrap');
   const timer = setTimeout(() => {}, 500);
-  timer.unref();
-  assert(Object.getPrototypeOf(timer._handle).hasOwnProperty('hasRef'), true);
-  assert(timer._handle.hasRef(), false);
-  timer.ref();
-  assert(timer._handle.hasRef(), true);
-  timer._handle.close(
-      common.mustCall(() => assert(timer._handle.hasRef(), false)));
+  setImmediate(() => {
+    timer.unref();
+    assert(Object.getPrototypeOf(timer._handle).hasOwnProperty('hasRef'), true);
+    assert(timer._handle.hasRef(), false);
+    timer.ref();
+    assert(timer._handle.hasRef(), true);
+    timer._handle.close(
+        common.mustCall(() => assert(timer._handle.hasRef(), false)));
+  });
 }

test/parallel/test-timers-active.js

@@ -12,11 +12,13 @@ var legitTimers = [
 legitTimers.forEach(function(legit) {
   const savedTimeout = legit._idleTimeout;
   active(legit);
-  // active() should mutate these objects
-  assert(legit._idleTimeout === savedTimeout);
-  assert(Number.isInteger(legit._idleStart));
-  assert(legit._idleNext);
-  assert(legit._idlePrev);
+  process.nextTick(() => {
+    // active() should mutate these objects
+    assert(legit._idleTimeout === savedTimeout);
+    assert(Number.isInteger(legit._idleStart));
+    assert(legit._idleNext);
+    assert(legit._idlePrev);
+  });
 });
 
 
@@ -29,6 +31,8 @@ var bogusTimers = [
 bogusTimers.forEach(function(bogus) {
   const savedTimeout = bogus._idleTimeout;
   active(bogus);
-  // active() should not mutate these objects
-  assert.deepStrictEqual(bogus, {_idleTimeout: savedTimeout});
+  process.nextTick(() => {
+    // active() should not mutate these objects
+    assert.deepStrictEqual(bogus, {_idleTimeout: savedTimeout});
+  });
 });

test/parallel/test-timers-same-timeout-wrong-list-deleted.js

@@ -56,25 +56,27 @@ const handle1 = setTimeout(common.mustCall(function() {
     }));
   }), 10);
 
-  // Make sure our timers got added to the list.
-  const activeHandles = process._getActiveHandles();
-  const activeTimers = activeHandles.filter(function(handle) {
-    return handle instanceof Timer;
-  });
-  const shortTimer = activeTimers.find(function(handle) {
-    return handle._list.msecs === 10;
-  });
-  const longTimers = activeTimers.filter(function(handle) {
-    return handle._list.msecs === TIMEOUT;
-  });
+  setImmediate(() => {
+    // Make sure our timers got added to the list.
+    const activeHandles = process._getActiveHandles();
+    const activeTimers = activeHandles.filter(function(handle) {
+      return handle instanceof Timer;
+    });
+    const shortTimer = activeTimers.find(function(handle) {
+      return handle._list.msecs === 10;
+    });
+    const longTimers = activeTimers.filter(function(handle) {
+      return handle._list.msecs === TIMEOUT;
+    });
 
-  // Make sure our clearTimeout succeeded. One timer finished and
-  // the other was canceled, so none should be active.
-  assert.equal(activeTimers.length, 3, 'There are 3 timers in the list.');
-  assert(shortTimer instanceof Timer, 'The shorter timer is in the list.');
-  assert.equal(longTimers.length, 2, 'Both longer timers are in the list.');
+    // Make sure our clearTimeout succeeded. One timer finished and
+    // the other was canceled, so none should be active.
+    assert.equal(activeTimers.length, 3, 'There are 3 timers in the list.');
+    assert(shortTimer instanceof Timer, 'The shorter timer is in the list.');
+    assert.equal(longTimers.length, 2, 'Both longer timers are in the list.');
 
-  // When this callback completes, `listOnTimeout` should now look at the
-  // correct list and refrain from removing the new TIMEOUT list which
-  // contains the reference to the newer timer.
+    // When this callback completes, `listOnTimeout` should now look at the
+    // correct list and refrain from removing the new TIMEOUT list which
+    // contains the reference to the newer timer.
+  });
 }), TIMEOUT);

test/parallel/test-timers-unref-leak.js

@@ -8,14 +8,16 @@ var closed = 0;
 var timeout = setTimeout(function() {
   called++;
 }, 10);
-timeout.unref();
 
 // Wrap `close` method to check if the handle was closed
-var close = timeout._handle.close;
-timeout._handle.close = function() {
-  closed++;
-  return close.apply(this, arguments);
-};
+process.nextTick(() => {
+  timeout.unref();
+  var close = timeout._handle.close;
+  timeout._handle.close = function() {
+    closed++;
+    return close.apply(this, arguments);
+  };
+});
 
 // Just to keep process alive and let previous timer's handle die
 setTimeout(function() {