Commit 676e618
committed
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: #3378
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>1 parent 0140e1b commit 676e618
13 files changed
Lines changed: 13 additions & 13 deletions
File tree
- test
- internet
- parallel
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -28,7 +28,7 @@ function callbackOnly(err) { | |||
| 28 | 28 | } | |
| 29 | 29 | ||
| 30 | 30 | function onEvent(err) { | |
| 31 | - assert.fail('Error should not be emitted if there is callback'); | ||
| 31 | + assert.fail(null, null, 'Error should not be emitted if there is callback'); | ||
| 32 | 32 | } | |
| 33 | 33 | ||
| 34 | 34 | function onError(err) { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -24,7 +24,7 @@ common.refreshTmpDir(); | |||
| 24 | 24 | var stream = fs.createWriteStream(file); | |
| 25 | 25 | ||
| 26 | 26 | stream.on('drain', function() { | |
| 27 | - assert.fail('\'drain\' event must not be emitted before ' + | ||
| 27 | + assert.fail(null, null, '\'drain\' event must not be emitted before ' + | ||
| 28 | 28 | 'stream.write() has been called at least once.'); | |
| 29 | 29 | }); | |
| 30 | 30 | stream.destroy(); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -27,7 +27,7 @@ var server = http.createServer(function(req, res) { | |||
| 27 | 27 | res.writeHead(200, { b: header }); | |
| 28 | 28 | break; | |
| 29 | 29 | default: | |
| 30 | - assert.fail('unreachable'); | ||
| 30 | + assert.fail(null, null, 'unreachable'); | ||
| 31 | 31 | } | |
| 32 | 32 | res.write(responseBody); | |
| 33 | 33 | if (testIndex % 8 < 4) { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -24,7 +24,7 @@ server.listen(common.PORT, '127.0.0.1', function() { | |||
| 24 | 24 | method: 'GET', | |
| 25 | 25 | localAddress: invalidLocalAddress | |
| 26 | 26 | }, function(res) { | |
| 27 | - assert.fail('unexpectedly got response from server'); | ||
| 27 | + assert.fail(null, null, 'unexpectedly got response from server'); | ||
| 28 | 28 | }).on('error', function(e) { | |
| 29 | 29 | console.log('client got error: ' + e.message); | |
| 30 | 30 | gotError = true; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -35,7 +35,7 @@ server.listen(common.PORT, '127.0.0.1', function() { | |||
| 35 | 35 | method: 'GET', | |
| 36 | 36 | localAddress: invalidLocalAddress | |
| 37 | 37 | }, function(res) { | |
| 38 | - assert.fail('unexpectedly got response from server'); | ||
| 38 | + assert.fail(null, null, 'unexpectedly got response from server'); | ||
| 39 | 39 | }).on('error', function(e) { | |
| 40 | 40 | console.log('client got error: ' + e.message); | |
| 41 | 41 | gotError = true; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -11,5 +11,5 @@ net.createServer(function(conn) { | |||
| 11 | 11 | net.connect(common.PORT, 'localhost').pause(); | |
| 12 | 12 | ||
| 13 | 13 | setTimeout(function() { | |
| 14 | - assert.fail('expected to exit'); | ||
| 14 | + assert.fail(null, null, 'expected to exit'); | ||
| 15 | 15 | }, 1000).unref(); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -14,7 +14,7 @@ var server = net.createServer(function(socket) { | |||
| 14 | 14 | socket.setNoDelay(); | |
| 15 | 15 | socket.setTimeout(1000); | |
| 16 | 16 | socket.on('timeout', function() { | |
| 17 | - assert.fail('flushed: ' + flushed + | ||
| 17 | + assert.fail(null, null, 'flushed: ' + flushed + | ||
| 18 | 18 | ', received: ' + received + '/' + SIZE * N); | |
| 19 | 19 | }); | |
| 20 | 20 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -89,7 +89,7 @@ function checkErrors(path) { | |||
| 89 | 89 | return; | |
| 90 | 90 | } | |
| 91 | 91 | ||
| 92 | - assert.fail('should have thrown'); | ||
| 92 | + assert.fail(null, null, 'should have thrown'); | ||
| 93 | 93 | }); | |
| 94 | 94 | } | |
| 95 | 95 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -45,7 +45,7 @@ function testResetGlobal(cb) { | |||
| 45 | 45 | } | |
| 46 | 46 | ||
| 47 | 47 | var timeout = setTimeout(function() { | |
| 48 | - assert.fail('Timeout, REPL did not emit reset events'); | ||
| 48 | + assert.fail(null, null, 'Timeout, REPL did not emit reset events'); | ||
| 49 | 49 | }, 5000); | |
| 50 | 50 | ||
| 51 | 51 | testReset(function() { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -389,5 +389,5 @@ function unix_test() { | |||
| 389 | 389 | unix_test(); | |
| 390 | 390 | ||
| 391 | 391 | timer = setTimeout(function() { | |
| 392 | - assert.fail('Timeout'); | ||
| 392 | + assert.fail(null, null, 'Timeout'); | ||
| 393 | 393 | }, 5000); | |
0 commit comments