summaryrefslogtreecommitdiff
path: root/test/parallel/test-domain-timers.js
diff options
context:
space:
mode:
authorcjihrig <cjihrig@gmail.com>2016-07-15 15:43:24 -0400
committercjihrig <cjihrig@gmail.com>2016-07-18 17:14:16 -0400
commit04b4d15b396a7befea31dbfec89f69ff71dc71ca (patch)
tree7819010b9b687fb20328c04645e9ec64c25b9328 /test/parallel/test-domain-timers.js
parent59741a9beeb0ccaac6fc3247605bf090d36ad50e (diff)
downloadandroid-node-v8-04b4d15b396a7befea31dbfec89f69ff71dc71ca.tar.gz
android-node-v8-04b4d15b396a7befea31dbfec89f69ff71dc71ca.tar.bz2
android-node-v8-04b4d15b396a7befea31dbfec89f69ff71dc71ca.zip
test: use mustCall() for simple flow tracking
Many of the tests use variables to track when callback functions are invoked or events are emitted. These variables are then asserted on process exit. This commit replaces this pattern in straightforward cases with common.mustCall(). This makes the tests easier to reason about, leads to a net reduction in lines of code, and uncovered a few bugs in tests. This commit also replaces some callbacks that should never be called with common.fail(). PR-URL: https://github.com/nodejs/node/pull/7753 Reviewed-By: Wyatt Preul <wpreul@gmail.com> Reviewed-By: Minwoo Jung <jmwsoft@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'test/parallel/test-domain-timers.js')
-rw-r--r--test/parallel/test-domain-timers.js24
1 files changed, 9 insertions, 15 deletions
diff --git a/test/parallel/test-domain-timers.js b/test/parallel/test-domain-timers.js
index 58989e812b..faa57df127 100644
--- a/test/parallel/test-domain-timers.js
+++ b/test/parallel/test-domain-timers.js
@@ -1,16 +1,16 @@
'use strict';
-require('../common');
+const common = require('../common');
var domain = require('domain');
var assert = require('assert');
-var timeout_err, timeout, immediate_err;
+var timeout;
var timeoutd = domain.create();
-timeoutd.on('error', function(e) {
- timeout_err = e;
+timeoutd.on('error', common.mustCall(function(e) {
+ assert.equal(e.message, 'Timeout UNREFd', 'Domain should catch timer error');
clearTimeout(timeout);
-});
+}));
timeoutd.run(function() {
setTimeout(function() {
@@ -20,9 +20,10 @@ timeoutd.run(function() {
var immediated = domain.create();
-immediated.on('error', function(e) {
- immediate_err = e;
-});
+immediated.on('error', common.mustCall(function(e) {
+ assert.equal(e.message, 'Immediate Error',
+ 'Domain should catch immediate error');
+}));
immediated.run(function() {
setImmediate(function() {
@@ -31,10 +32,3 @@ immediated.run(function() {
});
timeout = setTimeout(function() {}, 10 * 1000);
-
-process.on('exit', function() {
- assert.equal(timeout_err.message, 'Timeout UNREFd',
- 'Domain should catch timer error');
- assert.equal(immediate_err.message, 'Immediate Error',
- 'Domain should catch immediate error');
-});