test: fix race condition in unrefd interval test

mcornac · rvagg · commit 788541b40c0c · 2015-12-05T15:47:46.000+11:00
Rely more on timers implementation rather than arbitrary timeouts. Refs: #1781 PR-URL: #3550 Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
diff --git a/test/parallel/test-timers-unrefd-interval-still-fires.js b/test/parallel/test-timers-unrefd-interval-still-fires.js
@@ -2,19 +2,27 @@
 /*
 * This test is a regression test for joyent/node#8900.
 */
-require('../common');
-var assert = require('assert');
+const common = require('../common');
+const assert = require('assert');
 
-var N = 5;
+const TEST_DURATION = common.platformTimeout(100);
+const N = 5;
 var nbIntervalFired = 0;
-var timer = setInterval(function() {
+
+const keepOpen = setTimeout(() => {
+ console.error('[FAIL] Interval fired %d/%d times.', nbIntervalFired, N);
+ throw new Error('Test timed out. keepOpen was not canceled.');
+}, TEST_DURATION);
+
+const timer = setInterval(() => {
 ++nbIntervalFired;
- if (nbIntervalFired === N)
+ if (nbIntervalFired === N) {
 clearInterval(timer);
+ timer._onTimeout = () => {
+ throw new Error('Unrefd interval fired after being cleared.');
+ };
+ setImmediate(() => clearTimeout(keepOpen));
+ }
 }, 1);
 
 timer.unref();
-
-setTimeout(function onTimeout() {
- assert.strictEqual(nbIntervalFired, N);
-}, 100);

-Original file line number
+Diff line change
 /*
  * This test is a regression test for joyent/node#8900.
  */
 -require('../common');
 -varassert=require('assert');
 +constcommon=require('../common');
 +constassert=require('assert');
 -varN=5;
 +constTEST_DURATION=common.platformTimeout(100);
 +constN=5;
 varnbIntervalFired=0;
 -vartimer=setInterval(function(){
++
 +constkeepOpen=setTimeout(()=>{
 +console.error('[FAIL] Interval fired %d/%d times.',nbIntervalFired,N);
 +thrownewError('Test timed out. keepOpen was not canceled.');
 +},TEST_DURATION);
++
 +consttimer=setInterval(()=>{
 ++nbIntervalFired;
 -if(nbIntervalFired===N)
 +if(nbIntervalFired===N){
 clearInterval(timer);
 +timer._onTimeout=()=>{
 +thrownewError('Unrefd interval fired after being cleared.');
 +};
 +setImmediate(()=>clearTimeout(keepOpen));
 +}
 },1);
 timer.unref();
+-
 -setTimeout(functiononTimeout(){
 -assert.strictEqual(nbIntervalFired,N);
 -},100);