Skip to content

Commit

Permalink
test: fix test-debug-port-from-cmdline
Browse files Browse the repository at this point in the history
This change is a backport of 2b4b600
from io.js.

Original commit message:

  This test was failing because the spawned process was terminated
  before anything could be done, by calling child.stdin.end. With this
  change, the child's stdin is no longer closed. When the stdin is not
  a tty, io.js waits for the whole input before starting, so the child
  must be run with --interactive to process the command sent by the
  parent. The child is killed explicitly by the parent before it exits.

  This test was failing silently because the asserts were not called if
  nothing was received from the child. This fix moves assertOutputLines
  to always run on exit.

  Fixes: #2177
  Refs: #2094
  PR-URL: #2186
  Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  Reviewed-By: Rod Vagg <rod@vagg.org>
  Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
  Reviewed-By: Alexis Campailla <alexis@janeasystems.com>

Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
PR-URL: nodejs/node-v0.x-archive#25748
  • Loading branch information
joaocgreis committed Jul 23, 2015
1 parent 14db629 commit ceb6a8c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions test/simple/test-debug-port-from-cmdline.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ var assert = require('assert');
var spawn = require('child_process').spawn;

var debugPort = common.PORT;
var args = ['--debug-port=' + debugPort];
var args = ['--interactive', '--debug-port=' + debugPort];
var childOptions = { stdio: ['pipe', 'pipe', 'pipe', 'ipc'] };
var child = spawn(process.execPath, args, childOptions);

child.stdin.end("process.send({ msg: 'childready' });");
child.stdin.write("process.send({ msg: 'childready' });\n");

child.stderr.on('data', function(data) {
var lines = data.toString().replace(/\r/g, '').trim().split('\n');
Expand All @@ -43,6 +43,7 @@ child.on('message', function onChildMsg(message) {

process.on('exit', function() {
child.kill();
assertOutputLines();
});

var outputLines = [];
Expand All @@ -51,7 +52,6 @@ function processStderrLine(line) {
outputLines.push(line);

if (/Debugger listening/.test(line)) {
assertOutputLines();
process.exit();
}
}
Expand Down

0 comments on commit ceb6a8c

Please sign in to comment.