From 12777b028344b6c410f999e12a2079736871a60b Mon Sep 17 00:00:00 2001 From: Zahidul Islam Date: Sat, 22 Apr 2017 12:28:22 -0700 Subject: [PATCH 1/2] test: adding mustCall in test-timers-unrefed-in-callback.js --- test/parallel/test-timers-unrefed-in-callback.js | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/test/parallel/test-timers-unrefed-in-callback.js b/test/parallel/test-timers-unrefed-in-callback.js index c6fcb22789955a..d051da4ba15a79 100644 --- a/test/parallel/test-timers-unrefed-in-callback.js +++ b/test/parallel/test-timers-unrefed-in-callback.js @@ -2,8 +2,7 @@ // Checks that setInterval timers keep running even when they're // unrefed within their callback. -require('../common'); -const assert = require('assert'); +const common = require('../common'); const net = require('net'); let counter1 = 0; @@ -28,7 +27,7 @@ function Test1() { // server only for maintaining event loop const server = net.createServer().listen(0); - const timer1 = setInterval(() => { + const timer1 = setInterval(common.mustCall(() => { timer1.unref(); if (counter1++ === 3) { clearInterval(timer1); @@ -36,7 +35,7 @@ function Test1() { Test2(); }); } - }, 1); + }, 4), 1); } @@ -47,15 +46,11 @@ function Test2() { // server only for maintaining event loop const server = net.createServer().listen(0); - const timer2 = setInterval(() => { + const timer2 = setInterval(common.mustCall(() => { timer2.unref(); if (counter2++ === 3) server.close(); - }, 1); + }, 4), 1); } -process.on('exit', () => { - assert.strictEqual(counter1, 4); -}); - Test1(); From 938fb991287ce4ef2777d77604833edbe76c439d Mon Sep 17 00:00:00 2001 From: Zahidul Islam Date: Sat, 22 Apr 2017 13:25:40 -0700 Subject: [PATCH 2/2] test: update test-times-unrefed-in-callback.js --- test/parallel/test-timers-unrefed-in-callback.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-timers-unrefed-in-callback.js b/test/parallel/test-timers-unrefed-in-callback.js index d051da4ba15a79..50e6881bd3f60b 100644 --- a/test/parallel/test-timers-unrefed-in-callback.js +++ b/test/parallel/test-timers-unrefed-in-callback.js @@ -46,11 +46,11 @@ function Test2() { // server only for maintaining event loop const server = net.createServer().listen(0); - const timer2 = setInterval(common.mustCall(() => { + const timer2 = setInterval(() => { timer2.unref(); if (counter2++ === 3) server.close(); - }, 4), 1); + }, 1); } Test1();