test: apply correct assert.fail() arguments

The assert.fail function signature has the message as the third argument
but, understandably, it is often assumed that it is the first argument
(or at least the first argument if no other arguments are passed).

This corrects the assert.fail() invocations in the Node.js tests.

Before:
assert.fail('message');
// result: AssertionError: 'message' undefined undefined

After:
assert.fail(null, null, 'message');
// result: AssertionError: message

PR-URL: https://github.com/nodejs/node/pull/3378
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
This commit is contained in:
Rich Trott 2015-10-14 21:22:55 -07:00
parent 0140e1b5e3
commit 676e61872f
13 changed files with 13 additions and 13 deletions

View File

@ -28,7 +28,7 @@ function callbackOnly(err) {
}
function onEvent(err) {
assert.fail('Error should not be emitted if there is callback');
assert.fail(null, null, 'Error should not be emitted if there is callback');
}
function onError(err) {

View File

@ -24,7 +24,7 @@ common.refreshTmpDir();
var stream = fs.createWriteStream(file);
stream.on('drain', function() {
assert.fail('\'drain\' event must not be emitted before ' +
assert.fail(null, null, '\'drain\' event must not be emitted before ' +
'stream.write() has been called at least once.');
});
stream.destroy();

View File

@ -27,7 +27,7 @@ var server = http.createServer(function(req, res) {
res.writeHead(200, { b: header });
break;
default:
assert.fail('unreachable');
assert.fail(null, null, 'unreachable');
}
res.write(responseBody);
if (testIndex % 8 < 4) {

View File

@ -24,7 +24,7 @@ server.listen(common.PORT, '127.0.0.1', function() {
method: 'GET',
localAddress: invalidLocalAddress
}, function(res) {
assert.fail('unexpectedly got response from server');
assert.fail(null, null, 'unexpectedly got response from server');
}).on('error', function(e) {
console.log('client got error: ' + e.message);
gotError = true;

View File

@ -35,7 +35,7 @@ server.listen(common.PORT, '127.0.0.1', function() {
method: 'GET',
localAddress: invalidLocalAddress
}, function(res) {
assert.fail('unexpectedly got response from server');
assert.fail(null, null, 'unexpectedly got response from server');
}).on('error', function(e) {
console.log('client got error: ' + e.message);
gotError = true;

View File

@ -11,5 +11,5 @@ net.createServer(function(conn) {
net.connect(common.PORT, 'localhost').pause();
setTimeout(function() {
assert.fail('expected to exit');
assert.fail(null, null, 'expected to exit');
}, 1000).unref();

View File

@ -14,7 +14,7 @@ var server = net.createServer(function(socket) {
socket.setNoDelay();
socket.setTimeout(1000);
socket.on('timeout', function() {
assert.fail('flushed: ' + flushed +
assert.fail(null, null, 'flushed: ' + flushed +
', received: ' + received + '/' + SIZE * N);
});

View File

@ -89,7 +89,7 @@ function checkErrors(path) {
return;
}
assert.fail('should have thrown');
assert.fail(null, null, 'should have thrown');
});
}

View File

@ -45,7 +45,7 @@ function testResetGlobal(cb) {
}
var timeout = setTimeout(function() {
assert.fail('Timeout, REPL did not emit reset events');
assert.fail(null, null, 'Timeout, REPL did not emit reset events');
}, 5000);
testReset(function() {

View File

@ -389,5 +389,5 @@ function unix_test() {
unix_test();
timer = setTimeout(function() {
assert.fail('Timeout');
assert.fail(null, null, 'Timeout');
}, 5000);

View File

@ -39,7 +39,7 @@ if (!process.argv[2]) {
const comspec = process.env['comspec'];
if (!comspec || comspec.length === 0) {
assert.fail('Failed to get COMSPEC');
assert.fail(null, null, 'Failed to get COMSPEC');
}
const args = ['/c', process.execPath, __filename, 'child',

View File

@ -33,5 +33,5 @@ src.on('end', function() {
src.pipe(dst);
timeout = setTimeout(function() {
assert.fail('timed out waiting for _write');
assert.fail(null, null, 'timed out waiting for _write');
}, 100);

View File

@ -40,7 +40,7 @@ function runTest(pattern, code) {
return /^isolate-/.test(file);
});
if (matches.length != 1) {
assert.fail('There should be a single log file.');
assert.fail(null, null, 'There should be a single log file.');
}
var log = matches[0];
var out = cp.execSync(process.execPath + ' ' + processor +