Skip to content

Commit 29a4d35

Browse files
StarrySharkitaloacasas
authored andcommitted
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 <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent a06419b commit 29a4d35

File tree

1 file changed

+28
-11
lines changed

1 file changed

+28
-11
lines changed

test/parallel/test-cli-eval.js

+28-11
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ var filename = __filename.replace(/\\/g, '/');
1919
// assert that nothing is written to stdout
2020
child.exec(nodejs + ' --eval 42',
2121
function(err, stdout, stderr) {
22+
assert.ifError(err);
2223
assert.strictEqual(stdout, '');
2324
assert.strictEqual(stderr, '');
2425
});
2526

2627
// assert that "42\n" is written to stderr
2728
child.exec(nodejs + ' --eval "console.error(42)"',
2829
function(err, stdout, stderr) {
30+
assert.ifError(err);
2931
assert.strictEqual(stdout, '');
3032
assert.strictEqual(stderr, '42\n');
3133
});
@@ -36,66 +38,81 @@ child.exec(nodejs + ' --eval "console.error(42)"',
3638

3739
child.exec(cmd + '42',
3840
function(err, stdout, stderr) {
41+
assert.ifError(err);
3942
assert.strictEqual(stdout, '42\n');
4043
assert.strictEqual(stderr, '');
4144
});
4245

4346
child.exec(cmd + "'[]'", common.mustCall(
4447
function(err, stdout, stderr) {
48+
assert.ifError(err);
4549
assert.strictEqual(stdout, '[]\n');
4650
assert.strictEqual(stderr, '');
4751
}));
4852
});
4953

5054
// assert that module loading works
5155
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, '');
5461
});
5562

5663
// Check that builtin modules are pre-defined.
5764
child.exec(nodejs + ' --print "os.platform()"',
58-
function(status, stdout, stderr) {
65+
function(err, stdout, stderr) {
66+
assert.ifError(err);
5967
assert.strictEqual(stderr, '');
6068
assert.strictEqual(stdout.trim(), require('os').platform());
6169
});
6270

6371
// module path resolve bug, regression test
6472
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, '');
6778
});
6879

6980
// 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/));
7385
}));
7486

7587
// 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);
7790
assert.strictEqual(stdout, '');
7891
assert.strictEqual(stderr, '');
7992
});
8093

8194
// "\\-42" should be interpreted as an escaped expression, not a switch
8295
child.exec(nodejs + ' -p "\\-42"',
8396
function(err, stdout, stderr) {
97+
assert.ifError(err);
8498
assert.strictEqual(stdout, '-42\n');
8599
assert.strictEqual(stderr, '');
86100
});
87101

88102
child.exec(nodejs + ' --use-strict -p process.execArgv',
89-
function(status, stdout, stderr) {
103+
function(err, stdout, stderr) {
104+
assert.ifError(err);
90105
assert.strictEqual(
91106
stdout, "[ '--use-strict', '-p', 'process.execArgv' ]\n"
92107
);
108+
assert.strictEqual(stderr, '');
93109
});
94110

95111
// Regression test for https://github.com/nodejs/node/issues/3574
96112
const emptyFile = path.join(common.fixturesDir, 'empty.js');
97113
child.exec(nodejs + ` -e 'require("child_process").fork("${emptyFile}")'`,
98-
function(status, stdout, stderr) {
114+
function(err, stdout, stderr) {
115+
assert.ifError(err);
99116
assert.strictEqual(stdout, '');
100117
assert.strictEqual(stderr, '');
101118
});

0 commit comments

Comments
 (0)