diff options
author | Rich Trott <rtrott@gmail.com> | 2016-09-29 17:22:36 -0700 |
---|---|---|
committer | Rich Trott <rtrott@gmail.com> | 2016-10-02 20:40:51 -0700 |
commit | b5ec47e94119daf1c82dac85b7864ed8c0fcc313 (patch) | |
tree | d16a8fe765a7ece957ac2316b5b9de55d1b556ad /test/parallel/test-timers-immediate.js | |
parent | 68c4c71f7f60cb8f3c27db71aaa4177e6635f8b6 (diff) | |
download | android-node-v8-b5ec47e94119daf1c82dac85b7864ed8c0fcc313.tar.gz android-node-v8-b5ec47e94119daf1c82dac85b7864ed8c0fcc313.tar.bz2 android-node-v8-b5ec47e94119daf1c82dac85b7864ed8c0fcc313.zip |
test: clean up test-timers-immediate
Clean up test-timers-immediate. Use of `let` also requires a tweak to
ESLint rules (but it's one that we should do as timers is pretty much
the reason it exists).
PR-URL: https://github.com/nodejs/node/pull/8857
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ilkka Myller <ilkka.myller@nodefield.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Diffstat (limited to 'test/parallel/test-timers-immediate.js')
-rw-r--r-- | test/parallel/test-timers-immediate.js | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/test/parallel/test-timers-immediate.js b/test/parallel/test-timers-immediate.js index d160adc998..9632022917 100644 --- a/test/parallel/test-timers-immediate.js +++ b/test/parallel/test-timers-immediate.js @@ -1,25 +1,20 @@ 'use strict'; -require('../common'); -var assert = require('assert'); - -let immediateA = false; -let immediateB = false; -let immediateC = []; -let immediateD = []; - -setImmediate(function() { - try { - immediateA = process.hrtime(before); - } catch (e) { - console.log('failed to get hrtime with offset'); - } - clearImmediate(immediateB); -}); +const common = require('../common'); +const assert = require('assert'); + +let immediateB; +let immediateC; +let immediateD; -const before = process.hrtime(); +let mainFinished = false; + +setImmediate(common.mustCall(function() { + assert.strictEqual(mainFinished, true); + clearImmediate(immediateB); +})); immediateB = setImmediate(function() { - immediateB = true; + common.fail('this immediate should not run'); }); setImmediate(function(x, y, z) { @@ -31,8 +26,8 @@ setImmediate(function(x, y, z, a, b) { }, 1, 2, 3, 4, 5); process.on('exit', function() { - assert.ok(immediateA, 'Immediate should happen after normal execution'); - assert.notStrictEqual(immediateB, true, 'immediateB should not fire'); assert.deepStrictEqual(immediateC, [1, 2, 3], 'immediateC args should match'); assert.deepStrictEqual(immediateD, [1, 2, 3, 4, 5], '5 args should match'); }); + +mainFinished = true; |