mirror of
https://github.com/nodejs/node.git
synced 2025-08-16 06:08:50 +02:00
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>
This commit is contained in:
parent
59741a9bee
commit
04b4d15b39
213 changed files with 1101 additions and 2882 deletions
|
@ -1,12 +1,10 @@
|
|||
'use strict';
|
||||
var common = require('../common');
|
||||
var fs = require('fs');
|
||||
var net = require('net');
|
||||
var path = require('path');
|
||||
var assert = require('assert');
|
||||
var common = require('../common');
|
||||
|
||||
var notSocketErrorFired = false;
|
||||
var noEntErrorFired = false;
|
||||
var accessErrorFired = false;
|
||||
|
||||
// Test if ENOTSOCK is fired when trying to connect to a file which is not
|
||||
|
@ -43,11 +41,10 @@ var notSocketClient = net.createConnection(emptyTxt, function() {
|
|||
assert.ok(false);
|
||||
});
|
||||
|
||||
notSocketClient.on('error', function(err) {
|
||||
notSocketClient.on('error', common.mustCall(function(err) {
|
||||
assert(err.code === 'ENOTSOCK' || err.code === 'ECONNREFUSED',
|
||||
`received ${err.code} instead of ENOTSOCK or ECONNREFUSED`);
|
||||
notSocketErrorFired = true;
|
||||
});
|
||||
}));
|
||||
|
||||
|
||||
// Trying to connect to not-existing socket should result in ENOENT error
|
||||
|
@ -55,10 +52,9 @@ var noEntSocketClient = net.createConnection('no-ent-file', function() {
|
|||
assert.ok(false);
|
||||
});
|
||||
|
||||
noEntSocketClient.on('error', function(err) {
|
||||
noEntSocketClient.on('error', common.mustCall(function(err) {
|
||||
assert.equal(err.code, 'ENOENT');
|
||||
noEntErrorFired = true;
|
||||
});
|
||||
}));
|
||||
|
||||
|
||||
// On Windows or when running as root, a chmod has no effect on named pipes
|
||||
|
@ -85,10 +81,7 @@ if (!common.isWindows && process.getuid() !== 0) {
|
|||
|
||||
// Assert that all error events were fired
|
||||
process.on('exit', function() {
|
||||
assert.ok(notSocketErrorFired);
|
||||
assert.ok(noEntErrorFired);
|
||||
if (!common.isWindows && process.getuid() !== 0) {
|
||||
assert.ok(accessErrorFired);
|
||||
}
|
||||
});
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue