Skip to content

Commit

Permalink
test: debug-signal-cluster should not be racey
Browse files Browse the repository at this point in the history
unref one superfluous timer (as the test suite already has a global
timeout), and improve the state machine to iterate the messages more
reliably.

Ultimately make the test complete more quickly.

Original-PR-URL: [unknown]
Signed-off-by: Julien Gilli <julien.gilli@joyent.com>

PR-URL: #501
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Bert Belder <bertbelder@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
  • Loading branch information
tjfontaine authored and bnoordhuis committed Jan 19, 2015
1 parent cdf0df1 commit 992a1e7
Showing 1 changed file with 30 additions and 30 deletions.
60 changes: 30 additions & 30 deletions test/parallel/test-debug-signal-cluster.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,32 +14,32 @@ var pids = null;

child.stderr.on('data', function(data) {
var lines = data.toString().replace(/\r/g, '').trim().split('\n');
var line = lines[0];

lines.forEach(function(ln) { console.log('> ' + ln) } );
lines.forEach(function(line) {
console.log('> ' + line);

if (outputTimerId !== undefined)
clearTimeout(outputTimerId);
if (line === 'all workers are running') {
child.on('message', function(msg) {
if (msg.type !== 'pids')
return;

if (waitingForDebuggers) {
outputLines = outputLines.concat(lines);
outputTimerId = setTimeout(onNoMoreLines, 800);
} else if (line === 'all workers are running') {
child.on('message', function(msg) {
if (msg.type !== 'pids')
return;
pids = msg.pids;
console.error('got pids %j', pids);

pids = msg.pids;
console.error('got pids %j', pids);
waitingForDebuggers = true;
process._debugProcess(child.pid);
});

waitingForDebuggers = true;
process._debugProcess(child.pid);
});
child.send({
type: 'getpids'
});
} else if (waitingForDebuggers) {
outputLines.push(line);
}

child.send({
type: 'getpids'
});
}
});
if (outputLines.length >= expectedLines.length)
onNoMoreLines();
});

function onNoMoreLines() {
Expand All @@ -49,7 +49,7 @@ function onNoMoreLines() {

setTimeout(function testTimedOut() {
assert(false, 'test timed out.');
}, 6000);
}, 6000).unref();

process.on('exit', function onExit() {
// Kill processes in reverse order to avoid timing problems on Windows where
Expand All @@ -59,16 +59,16 @@ process.on('exit', function onExit() {
});
});

function assertOutputLines() {
var expectedLines = [
'Starting debugger agent.',
'Debugger listening on port ' + 5858,
'Starting debugger agent.',
'Debugger listening on port ' + 5859,
'Starting debugger agent.',
'Debugger listening on port ' + 5860,
];
var expectedLines = [
'Starting debugger agent.',
'Debugger listening on port ' + 5858,
'Starting debugger agent.',
'Debugger listening on port ' + 5859,
'Starting debugger agent.',
'Debugger listening on port ' + 5860,
];

function assertOutputLines() {
// Do not assume any particular order of output messages,
// since workers can take different amout of time to
// start up
Expand Down

0 comments on commit 992a1e7

Please sign in to comment.