Skip to content

Commit

Permalink
test: s/assert.fail/common.fail as appropriate
Browse files Browse the repository at this point in the history
Many tests use assert.fail(null, null, msg) where it would be
simpler to use common.fail(msg). This is largely because
common.fail() is fairly new. This commit makes the replacement
when applicable.

PR-URL: #7735
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
  • Loading branch information
cjihrig authored and MylesBorins committed Oct 26, 2016
1 parent 227db0a commit 58f3fa1
Show file tree
Hide file tree
Showing 25 changed files with 46 additions and 56 deletions.
2 changes: 1 addition & 1 deletion test/internet/test-dgram-send-cb-quelches-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function callbackOnly(err) {
}

function onEvent(err) {
assert.fail(null, null, 'Error should not be emitted if there is callback');
common.fail('Error should not be emitted if there is callback');
}

function onError(err) {
Expand Down
12 changes: 6 additions & 6 deletions test/parallel/test-event-emitter-listeners-side-effects.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

require('../common');
const common = require('../common');
var assert = require('assert');

var EventEmitter = require('events').EventEmitter;
Expand All @@ -13,12 +13,12 @@ assert(Array.isArray(fl));
assert(fl.length === 0);
assert.deepEqual(e._events, {});

e.on('foo', assert.fail);
e.on('foo', common.fail);
fl = e.listeners('foo');
assert(e._events.foo === assert.fail);
assert(e._events.foo === common.fail);
assert(Array.isArray(fl));
assert(fl.length === 1);
assert(fl[0] === assert.fail);
assert(fl[0] === common.fail);

e.listeners('bar');
assert(!e._events.hasOwnProperty('bar'));
Expand All @@ -28,12 +28,12 @@ fl = e.listeners('foo');

assert(Array.isArray(e._events.foo));
assert(e._events.foo.length === 2);
assert(e._events.foo[0] === assert.fail);
assert(e._events.foo[0] === common.fail);
assert(e._events.foo[1] === assert.ok);

assert(Array.isArray(fl));
assert(fl.length === 2);
assert(fl[0] === assert.fail);
assert(fl[0] === common.fail);
assert(fl[1] === assert.ok);

console.log('ok');
4 changes: 2 additions & 2 deletions test/parallel/test-event-emitter-once.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';
require('../common');
const common = require('../common');
var assert = require('assert');
var events = require('events');

Expand All @@ -16,7 +16,7 @@ e.emit('hello', 'a', 'b');
e.emit('hello', 'a', 'b');

var remove = function() {
assert.fail(1, 0, 'once->foo should not be emitted', '!');
common.fail('once->foo should not be emitted');
};

e.once('foo', remove);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ server.listen(0, () => {
// both a Content-Length header and a Transfer-Encoding: chunked
// header, which is a violation of the HTTP spec.
const req = http.get({port: server.address().port}, (res) => {
assert.fail(null, null, 'callback should not be called');
common.fail('callback should not be called');
});
req.on('error', common.mustCall((err) => {
assert(/^Parse Error/.test(err.message));
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-http-client-reject-cr-no-lf.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ server.listen(0, () => {
// The callback should not be called because the server is sending a
// header field that ends only in \r with no following \n
const req = http.get({port: server.address().port}, (res) => {
assert.fail(null, null, 'callback should not be called');
common.fail('callback should not be called');
});
req.on('error', common.mustCall((err) => {
assert(/^Parse Error/.test(err.message));
Expand Down
3 changes: 1 addition & 2 deletions test/parallel/test-http-double-content-length.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ server.listen(0, () => {
// Send two content-length header values.
headers: {'Content-Length': [1, 2]}},
(res) => {
assert.fail(null, null, 'an error should have occurred');
server.close();
common.fail('an error should have occurred');
}
);
req.on('error', common.mustCall(() => {
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-http-localaddress-bind-error.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';
require('../common');
const common = require('../common');
var assert = require('assert');
var http = require('http');

Expand All @@ -24,7 +24,7 @@ server.listen(0, '127.0.0.1', function() {
method: 'GET',
localAddress: invalidLocalAddress
}, function(res) {
assert.fail(null, null, 'unexpectedly got response from server');
common.fail('unexpectedly got response from server');
}).on('error', function(e) {
console.log('client got error: ' + e.message);
gotError = true;
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-http-response-multi-content-length.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const server = http.createServer((req, res) => {
res.writeHead(200, {'content-length': [1, 2]});
break;
default:
assert.fail(null, null, 'should never get here');
common.fail('should never get here');
}
res.end('ok');
});
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-http-response-splitting.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const server = http.createServer((req, res) => {
}));
break;
default:
assert.fail(null, null, 'should not get to here.');
common.fail('should not get to here.');
}
if (count === 3)
server.close();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const reqstr = 'POST / HTTP/1.1\r\n' +
'Transfer-Encoding: chunked\r\n\r\n';

const server = http.createServer((req, res) => {
assert.fail(null, null, 'callback should not be invoked');
common.fail('callback should not be invoked');
});
server.on('clientError', common.mustCall((err) => {
assert(/^Parse Error/.test(err.message));
Expand All @@ -25,7 +25,7 @@ server.listen(0, () => {
client.on('data', (data) => {
// Should not get to this point because the server should simply
// close the connection without returning any data.
assert.fail(null, null, 'no data should be returned by the server');
common.fail('no data should be returned by the server');
});
client.on('end', common.mustCall(() => {}));
});
4 changes: 2 additions & 2 deletions test/parallel/test-http-server-reject-cr-no-lf.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const str = 'GET / HTTP/1.1\r\n' +


const server = http.createServer((req, res) => {
assert.fail(null, null, 'this should not be called');
common.fail('this should not be called');
});
server.on('clientError', common.mustCall((err) => {
assert(/^Parse Error/.test(err.message));
Expand All @@ -22,7 +22,7 @@ server.on('clientError', common.mustCall((err) => {
server.listen(0, () => {
const client = net.connect({port: server.address().port}, () => {
client.on('data', (chunk) => {
assert.fail(null, null, 'this should not be called');
common.fail('this should not be called');
});
client.on('end', common.mustCall(() => {
server.close();
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-https-localaddress-bind-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ server.listen(0, '127.0.0.1', function() {
method: 'GET',
localAddress: invalidLocalAddress
}, function(res) {
assert.fail(null, null, 'unexpectedly got response from server');
common.fail('unexpectedly got response from server');
}).on('error', function(e) {
console.log('client got error: ' + e.message);
gotError = true;
Expand Down
5 changes: 2 additions & 3 deletions test/parallel/test-net-connect-immediate-destroy.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const net = require('net');

const socket = net.connect(common.PORT, common.localhostIPv4, assert.fail);
socket.on('error', assert.fail);
const socket = net.connect(common.PORT, common.localhostIPv4, common.fail);
socket.on('error', common.fail);
socket.destroy();
5 changes: 2 additions & 3 deletions test/parallel/test-net-connect-paused-connection.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
'use strict';
require('../common');
var assert = require('assert');
const common = require('../common');

var net = require('net');

Expand All @@ -10,6 +9,6 @@ net.createServer(function(conn) {
net.connect(this.address().port, 'localhost').pause();

setTimeout(function() {
assert.fail(null, null, 'expected to exit');
common.fail('expected to exit');
}, 1000).unref();
}).unref();
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
'use strict';
require('../common');
const common = require('../common');
var assert = require('assert');
var net = require('net');

var server = net.createServer(assert.fail);
var server = net.createServer(common.fail);
var closeEvents = 0;

server.on('close', function() {
++closeEvents;
});

server.listen(0, function() {
assert(false);
});
server.listen(0, common.fail);

server.close('bad argument');

Expand Down
6 changes: 3 additions & 3 deletions test/parallel/test-net-listen-port-option.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';
require('../common');
var common = require('../common');
var assert = require('assert');
var net = require('net');

Expand All @@ -17,12 +17,12 @@ net.Server().listen({ port: '0' }, close);
'-Infinity'
].forEach(function(port) {
assert.throws(function() {
net.Server().listen({ port: port }, assert.fail);
net.Server().listen({ port: port }, common.fail);
}, /port should be >= 0 and < 65536/i);
});

[null, true, false].forEach(function(port) {
assert.throws(function() {
net.Server().listen({ port: port }, assert.fail);
net.Server().listen({ port: port }, common.fail);
}, /invalid listen argument/i);
});
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';
require('../common');
const common = require('../common');
var assert = require('assert');

var net = require('net');
Expand Down Expand Up @@ -86,5 +86,5 @@ process.on('exit', function() {

process.on('unhandledRejection', function() {
console.error('promise rejected');
assert.fail(null, null, 'A promise in the chain rejected');
common.fail('A promise in the chain rejected');
});
5 changes: 2 additions & 3 deletions test/parallel/test-net-write-slow.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';
require('../common');
const common = require('../common');
var assert = require('assert');
var net = require('net');

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

for (var i = 0; i < N; ++i) {
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-path-parse-format.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';
require('../common');
var common = require('../common');
var assert = require('assert');
var path = require('path');

Expand Down Expand Up @@ -89,7 +89,7 @@ function checkErrors(path) {
return;
}

assert.fail(null, null, 'should have thrown');
common.fail(null, null, 'should have thrown');
});
}

Expand Down
5 changes: 2 additions & 3 deletions test/parallel/test-process-exit-from-before-exit.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
'use strict';
var assert = require('assert');
var common = require('../common');

process.on('beforeExit', common.mustCall(function() {
setTimeout(assert.fail, 5);
setTimeout(common.fail, 5);
process.exit(0); // Should execute immediately even if we schedule new work.
assert.fail();
common.fail();
}));
2 changes: 1 addition & 1 deletion test/parallel/test-repl-reset-event.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function testResetGlobal(cb) {
}

var timeout = setTimeout(function() {
assert.fail(null, null, 'Timeout, REPL did not emit reset events');
common.fail('Timeout, REPL did not emit reset events');
}, 5000);

testReset(function() {
Expand Down
6 changes: 2 additions & 4 deletions test/parallel/test-repl-tab.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';
require('../common');
const common = require('../common');
var assert = require('assert');
var repl = require('repl');
var zlib = require('zlib');
Expand All @@ -10,9 +10,7 @@ var testMe = repl.start('', putIn, function(cmd, context, filename, callback) {
callback(null, cmd);
});

testMe._domain.on('error', function(e) {
assert.fail();
});
testMe._domain.on('error', common.fail);

testMe.complete('', function(err, results) {
assert.equal(err, null);
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-spawn-cmd-named-pipe.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ if (!process.argv[2]) {

const comspec = process.env['comspec'];
if (!comspec || comspec.length === 0) {
assert.fail(null, null, 'Failed to get COMSPEC');
common.fail('Failed to get COMSPEC');
}

const args = ['/c', process.execPath, __filename, 'child',
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-stream2-base64-single-char-read-end.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';
require('../common');
const common = require('../common');
var R = require('_stream_readable');
var W = require('_stream_writable');
var assert = require('assert');
Expand Down Expand Up @@ -33,5 +33,5 @@ src.on('end', function() {
src.pipe(dst);

timeout = setTimeout(function() {
assert.fail(null, null, 'timed out waiting for _write');
common.fail('timed out waiting for _write');
}, 100);
3 changes: 1 addition & 2 deletions test/sequential/test-child-process-emfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ proc.on('error', common.mustCall(function(err) {
}));

proc.on('exit', function() {
const msg = '"exit" should not be emitted (the process never spawned!)';
assert.fail(null, null, msg);
common.fail('"exit" should not be emitted (the process never spawned!)');
});

// close one fd for LSan
Expand Down

0 comments on commit 58f3fa1

Please sign in to comment.