Commit 29a4d35
test: refactor test-cli-eval.js
* assert unused vars in test-cli-eval.js
* assert in more idiomatic way test-cli-eval
* rename status to err in test-cli-eval.js
PR-URL: #10759
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent a06419b commit 29a4d35
1 file changed
Lines changed: 28 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -19,13 +19,15 @@ var filename = __filename.replace(/\\/g, '/'); | |||
| 19 | 19 | // assert that nothing is written to stdout | |
| 20 | 20 | child.exec(nodejs + ' --eval 42', | |
| 21 | 21 | function(err, stdout, stderr) { | |
| 22 | + assert.ifError(err); | ||
| 22 | 23 | assert.strictEqual(stdout, ''); | |
| 23 | 24 | assert.strictEqual(stderr, ''); | |
| 24 | 25 | }); | |
| 25 | 26 | ||
| 26 | 27 | // assert that "42\n" is written to stderr | |
| 27 | 28 | child.exec(nodejs + ' --eval "console.error(42)"', | |
| 28 | 29 | function(err, stdout, stderr) { | |
| 30 | + assert.ifError(err); | ||
| 29 | 31 | assert.strictEqual(stdout, ''); | |
| 30 | 32 | assert.strictEqual(stderr, '42\n'); | |
| 31 | 33 | }); | |
@@ -36,66 +38,81 @@ child.exec(nodejs + ' --eval "console.error(42)"', | |||
| 36 | 38 | ||
| 37 | 39 | child.exec(cmd + '42', | |
| 38 | 40 | function(err, stdout, stderr) { | |
| 41 | + assert.ifError(err); | ||
| 39 | 42 | assert.strictEqual(stdout, '42\n'); | |
| 40 | 43 | assert.strictEqual(stderr, ''); | |
| 41 | 44 | }); | |
| 42 | 45 | ||
| 43 | 46 | child.exec(cmd + "'[]'", common.mustCall( | |
| 44 | 47 | function(err, stdout, stderr) { | |
| 48 | + assert.ifError(err); | ||
| 45 | 49 | assert.strictEqual(stdout, '[]\n'); | |
| 46 | 50 | assert.strictEqual(stderr, ''); | |
| 47 | 51 | })); | |
| 48 | 52 | }); | |
| 49 | 53 | ||
| 50 | 54 | // assert that module loading works | |
| 51 | 55 | child.exec(nodejs + ' --eval "require(\'' + filename + '\')"', | |
| 52 | - function(status, stdout, stderr) { | ||
| 53 | - assert.strictEqual(status.code, 42); | ||
| 56 | + function(err, stdout, stderr) { | ||
| 57 | + assert.strictEqual(err.code, 42); | ||
| 58 | + assert.strictEqual( | ||
| 59 | + stdout, 'Loaded as a module, exiting with status code 42.\n'); | ||
| 60 | + assert.strictEqual(stderr, ''); | ||
| 54 | 61 | }); | |
| 55 | 62 | ||
| 56 | 63 | // Check that builtin modules are pre-defined. | |
| 57 | 64 | child.exec(nodejs + ' --print "os.platform()"', | |
| 58 | - function(status, stdout, stderr) { | ||
| 65 | + function(err, stdout, stderr) { | ||
| 66 | + assert.ifError(err); | ||
| 59 | 67 | assert.strictEqual(stderr, ''); | |
| 60 | 68 | assert.strictEqual(stdout.trim(), require('os').platform()); | |
| 61 | 69 | }); | |
| 62 | 70 | ||
| 63 | 71 | // module path resolve bug, regression test | |
| 64 | 72 | child.exec(nodejs + ' --eval "require(\'./test/parallel/test-cli-eval.js\')"', | |
| 65 | - function(status, stdout, stderr) { | ||
| 66 | - assert.strictEqual(status.code, 42); | ||
| 73 | + function(err, stdout, stderr) { | ||
| 74 | + assert.strictEqual(err.code, 42); | ||
| 75 | + assert.strictEqual( | ||
| 76 | + stdout, 'Loaded as a module, exiting with status code 42.\n'); | ||
| 77 | + assert.strictEqual(stderr, ''); | ||
| 67 | 78 | }); | |
| 68 | 79 | ||
| 69 | 80 | // Missing argument should not crash | |
| 70 | - child.exec(nodejs + ' -e', common.mustCall(function(status, stdout, stderr) { | ||
| 71 | - assert.notStrictEqual(status, null); | ||
| 72 | - assert.strictEqual(status.code, 9); | ||
| 81 | + child.exec(nodejs + ' -e', common.mustCall(function(err, stdout, stderr) { | ||
| 82 | + assert.strictEqual(err.code, 9); | ||
| 83 | + assert.strictEqual(stdout, ''); | ||
| 84 | + assert(stderr.match(/node: -e requires an argument\n/)); | ||
| 73 | 85 | })); | |
| 74 | 86 | ||
| 75 | 87 | // empty program should do nothing | |
| 76 | - child.exec(nodejs + ' -e ""', function(status, stdout, stderr) { | ||
| 88 | + child.exec(nodejs + ' -e ""', function(err, stdout, stderr) { | ||
| 89 | + assert.ifError(err); | ||
| 77 | 90 | assert.strictEqual(stdout, ''); | |
| 78 | 91 | assert.strictEqual(stderr, ''); | |
| 79 | 92 | }); | |
| 80 | 93 | ||
| 81 | 94 | // "\\-42" should be interpreted as an escaped expression, not a switch | |
| 82 | 95 | child.exec(nodejs + ' -p "\\-42"', | |
| 83 | 96 | function(err, stdout, stderr) { | |
| 97 | + assert.ifError(err); | ||
| 84 | 98 | assert.strictEqual(stdout, '-42\n'); | |
| 85 | 99 | assert.strictEqual(stderr, ''); | |
| 86 | 100 | }); | |
| 87 | 101 | ||
| 88 | 102 | child.exec(nodejs + ' --use-strict -p process.execArgv', | |
| 89 | - function(status, stdout, stderr) { | ||
| 103 | + function(err, stdout, stderr) { | ||
| 104 | + assert.ifError(err); | ||
| 90 | 105 | assert.strictEqual( | |
| 91 | 106 | stdout, "[ '--use-strict', '-p', 'process.execArgv' ]\n" | |
| 92 | 107 | ); | |
| 108 | + assert.strictEqual(stderr, ''); | ||
| 93 | 109 | }); | |
| 94 | 110 | ||
| 95 | 111 | // Regression test for https://github.com/nodejs/node/issues/3574 | |
| 96 | 112 | const emptyFile = path.join(common.fixturesDir, 'empty.js'); | |
| 97 | 113 | child.exec(nodejs + ` -e 'require("child_process").fork("${emptyFile}")'`, | |
| 98 | - function(status, stdout, stderr) { | ||
| 114 | + function(err, stdout, stderr) { | ||
| 115 | + assert.ifError(err); | ||
| 99 | 116 | assert.strictEqual(stdout, ''); | |
| 100 | 117 | assert.strictEqual(stderr, ''); | |
| 101 | 118 | }); | |
0 commit comments