Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: scope redeclared vars in test-child-process* #4944

Closed
wants to merge 2 commits into from
Closed

test: scope redeclared vars in test-child-process* #4944

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a50342
test: scope redeclared vars in test-child-process*
Trott Jan 29, 2016
232bea0
fixup
Trott Jan 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions test/parallel/test-child-process-default-options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ var spawn = require('child_process').spawn;

process.env.HELLO = 'WORLD';

var child;
if (common.isWindows) {
var child = spawn('cmd.exe', ['/c', 'set'], {});
child = spawn('cmd.exe', ['/c', 'set'], {});
} else {
var child = spawn('/usr/bin/env', [], {});
child = spawn('/usr/bin/env', [], {});
}

var response = '';
Expand Down
5 changes: 3 additions & 2 deletions test/parallel/test-child-process-env.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ env.__proto__ = {
'FOO': 'BAR'
};

var child;
if (common.isWindows) {
var child = spawn('cmd.exe', ['/c', 'set'], {env: env});
child = spawn('cmd.exe', ['/c', 'set'], {env: env});
} else {
var child = spawn('/usr/bin/env', [], {env: env});
child = spawn('/usr/bin/env', [], {env: env});
}


Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-child-process-fork-dgram.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ if (process.argv[2] === 'child') {
});

} else {
var server = dgram.createSocket('udp4');
server = dgram.createSocket('udp4');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you declare the variable outside of the if block ?
Edit: I mean move the declaration.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, done!

var client = dgram.createSocket('udp4');
var child = fork(__filename, ['child']);

Expand Down
8 changes: 4 additions & 4 deletions test/parallel/test-child-process-silent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ var assert = require('assert');
var childProcess = require('child_process');

// Child pipe test
if (process.argv[2] === 'pipetest') {
if (process.argv[2] === 'pipe') {
process.stdout.write('stdout message');
process.stderr.write('stderr message');

} else if (process.argv[2] === 'ipctest') {
} else if (process.argv[2] === 'ipc') {
// Child IPC test
process.send('message from child');
process.on('message', function() {
Expand All @@ -18,7 +18,7 @@ if (process.argv[2] === 'pipetest') {
} else if (process.argv[2] === 'parent') {
// Parent | start child pipe test

var child = childProcess.fork(process.argv[1], ['pipetest'], {silent: true});
const child = childProcess.fork(process.argv[1], ['pipe'], {silent: true});

// Allow child process to self terminate
child._channel.close();
Expand Down Expand Up @@ -46,7 +46,7 @@ if (process.argv[2] === 'pipetest') {
});

// testing: do message system work when using silent
var child = childProcess.fork(process.argv[1], ['ipctest'], {silent: true});
const child = childProcess.fork(process.argv[1], ['ipc'], {silent: true});

// Manual pipe so we will get errors
child.stderr.pipe(process.stderr, {end: false});
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-child-process-stdio-big-write-end.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function parent() {

// then write a bunch more times.
for (var i = 0; i < 100; i++) {
var buf = new Buffer(BUFSIZE);
const buf = new Buffer(BUFSIZE);
buf.fill('.');
sent += BUFSIZE;
child.stdin.write(buf);
Expand Down
44 changes: 24 additions & 20 deletions test/parallel/test-child-process-validate-stdio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Flags: --expose_internals

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

// should throw if string and not ignore, pipe, or inherit
assert.throws(function() {
Expand All @@ -16,27 +16,31 @@ assert.throws(function() {
}, /Incorrect value of stdio option/);

// should populate stdio with undefined if len < 3
var stdio1 = [];
var result = _validateStdio(stdio1, false);
assert.equal(stdio1.length, 3);
assert.equal(result.hasOwnProperty('stdio'), true);
assert.equal(result.hasOwnProperty('ipc'), true);
assert.equal(result.hasOwnProperty('ipcFd'), true);
{
const stdio1 = [];
const result = _validateStdio(stdio1, false);
assert.equal(stdio1.length, 3);
assert.equal(result.hasOwnProperty('stdio'), true);
assert.equal(result.hasOwnProperty('ipc'), true);
assert.equal(result.hasOwnProperty('ipcFd'), true);
}

// should throw if stdio has ipc and sync is true
var stdio2 = ['ipc', 'ipc', 'ipc'];
const stdio2 = ['ipc', 'ipc', 'ipc'];
assert.throws(function() {
_validateStdio(stdio2, true);
}, /You cannot use IPC with synchronous forks/);

const stdio3 = [process.stdin, process.stdout, process.stderr];
var result = _validateStdio(stdio3, false);
assert.deepStrictEqual(result, {
stdio: [
{ type: 'fd', fd: 0 },
{ type: 'fd', fd: 1 },
{ type: 'fd', fd: 2 }
],
ipc: undefined,
ipcFd: undefined
});
{
const stdio3 = [process.stdin, process.stdout, process.stderr];
const result = _validateStdio(stdio3, false);
assert.deepStrictEqual(result, {
stdio: [
{ type: 'fd', fd: 0 },
{ type: 'fd', fd: 1 },
{ type: 'fd', fd: 2 }
],
ipc: undefined,
ipcFd: undefined
});
}