Permalink
Browse files

child_process: align fork/spawn stdio error msg

fork()'s support for .stdio strings in 3268863 used a different
TypeError string from spawn, unnecessarily.

PR-URL: #11044
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Brian White <mscdex@mscdex.net>
  • Loading branch information...
sam-github authored and jasnell committed Jan 30, 2017
1 parent 7818245 commit 4cafa60c99f0d755b1df3a29357e19a92b97eed8
Showing with 10 additions and 11 deletions.
  1. +9 −10 lib/child_process.js
  2. +1 −1 test/parallel/test-child-process-fork-stdio-string-variant.js
View
@@ -18,7 +18,14 @@ const setupChannel = child_process.setupChannel;
const ChildProcess = exports.ChildProcess = child_process.ChildProcess;
function stdioStringToArray(option) {
return [option, option, option, 'ipc'];
switch (option) {
case 'ignore':
case 'pipe':
case 'inherit':
return [option, option, option, 'ipc'];
default:
throw new TypeError('Incorrect value of stdio option: ' + option);
}
}
exports.fork = function(modulePath /*, args, options*/) {
@@ -55,15 +62,7 @@ exports.fork = function(modulePath /*, args, options*/) {
args = execArgv.concat([modulePath], args);
if (typeof options.stdio === 'string') {
switch (options.stdio) {
case 'ignore':
case 'pipe':
case 'inherit':
options.stdio = stdioStringToArray(options.stdio);
break;
default:
throw new TypeError('Unknown stdio option');
}
options.stdio = stdioStringToArray(options.stdio);
} else if (!Array.isArray(options.stdio)) {
// Use a separate fd=3 for the IPC channel. Inherit stdin, stdout,
// and stderr from the parent if silent isn't set.
@@ -9,7 +9,7 @@ const assert = require('assert');
const fork = require('child_process').fork;
const childScript = `${common.fixturesDir}/child-process-spawn-node`;
const errorRegexp = /^TypeError: Unknown stdio option$/;
const errorRegexp = /^TypeError: Incorrect value of stdio option:/;
const malFormedOpts = {stdio: '33'};
const payload = {hello: 'world'};
const stringOpts = {stdio: 'pipe'};

0 comments on commit 4cafa60

Please sign in to comment.