diff --git a/test/parallel/test-timers-immediate-queue.js b/test/parallel/test-timers-immediate-queue.js index 43897f50617fd7..103cd964511a53 100644 --- a/test/parallel/test-timers-immediate-queue.js +++ b/test/parallel/test-timers-immediate-queue.js @@ -6,10 +6,8 @@ const assert = require('assert'); // but immediates queued while processing the current queue should happen // on the next turn of the event loop. -// in v0.10 hit should be 1, because we only process one cb per turn -// in v0.11 and beyond it should be the exact same size of QUEUE -// if we're letting things recursively add to the immediate QUEUE hit will be -// > QUEUE +// hit should be the exact same size of QUEUE, if we're letting things +// recursively add to the immediate QUEUE hit will be > QUEUE let ticked = false; diff --git a/test/parallel/test-timers-non-integer-delay.js b/test/parallel/test-timers-non-integer-delay.js index b062fcb6f229b0..cd7fa5e661dc81 100644 --- a/test/parallel/test-timers-non-integer-delay.js +++ b/test/parallel/test-timers-non-integer-delay.js @@ -1,4 +1,6 @@ 'use strict'; +require('../common'); + /* * This test makes sure that non-integer timer delays do not make the process * hang. See https://github.com/joyent/node/issues/8065 and @@ -15,8 +17,6 @@ * it 100%. */ -require('../common'); - const TIMEOUT_DELAY = 1.1; const NB_TIMEOUTS_FIRED = 50; diff --git a/test/parallel/test-timers-ordering.js b/test/parallel/test-timers-ordering.js index a426bd75c9abcd..853f80a66a2384 100644 --- a/test/parallel/test-timers-ordering.js +++ b/test/parallel/test-timers-ordering.js @@ -1,8 +1,8 @@ 'use strict'; require('../common'); const assert = require('assert'); -const Timer = process.binding('timer_wrap').Timer; +const Timer = process.binding('timer_wrap').Timer; const N = 30; let last_i = 0; diff --git a/test/parallel/test-timers-uncaught-exception.js b/test/parallel/test-timers-uncaught-exception.js index e5ec037ff89066..4304a984189b81 100644 --- a/test/parallel/test-timers-uncaught-exception.js +++ b/test/parallel/test-timers-uncaught-exception.js @@ -1,40 +1,19 @@ 'use strict'; -require('../common'); +const common = require('../common'); const assert = require('assert'); -let exceptions = 0; -let timer1 = 0; -let timer2 = 0; +const errorMsg = 'BAM!'; // the first timer throws... -console.error('set first timer'); -setTimeout(function() { - console.error('first timer'); - timer1++; - throw new Error('BAM!'); -}, 100); +setTimeout(common.mustCall(function() { + throw new Error(errorMsg); +}), 1); // ...but the second one should still run -console.error('set second timer'); -setTimeout(function() { - console.error('second timer'); - assert.strictEqual(timer1, 1); - timer2++; -}, 100); +setTimeout(common.mustCall(function() {}), 1); function uncaughtException(err) { - console.error('uncaught handler'); - assert.strictEqual(err.message, 'BAM!'); - exceptions++; + assert.strictEqual(err.message, errorMsg); } -process.on('uncaughtException', uncaughtException); -let exited = false; -process.on('exit', function() { - assert(!exited); - exited = true; - process.removeListener('uncaughtException', uncaughtException); - assert.strictEqual(exceptions, 1); - assert.strictEqual(timer1, 1); - assert.strictEqual(timer2, 1); -}); +process.on('uncaughtException', common.mustCall(uncaughtException));