Skip to content

Commit

Permalink
test: fix timing issue in signal test
Browse files Browse the repository at this point in the history
Change sequential/test-signal-unregister so it doesn't use fixed
timeouts for sending the signal and expecting the child to quit.

Fixes: #1223
PR-URL: #1227
Reviewed-By: Johan Bergström <[email protected]>
  • Loading branch information
bnoordhuis committed Mar 22, 2015
1 parent cf081a4 commit 10a9c00
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 27 deletions.
1 change: 1 addition & 0 deletions test/fixtures/should_exit.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ process.removeListener('SIGINT', tmp);
setInterval(function() {
process.stdout.write('keep alive\n');
}, 1000);
process.stdout.write('start\n');
34 changes: 7 additions & 27 deletions test/sequential/test-signal-unregister.js
Original file line number Diff line number Diff line change
@@ -1,32 +1,12 @@
var common = require('../common');
var assert = require('assert');
var spawn = require('child_process').spawn;

var childKilled = false, done = false,
spawn = require('child_process').spawn,
util = require('util'),
child;

var join = require('path').join;

child = spawn(process.argv[0], [join(common.fixturesDir, 'should_exit.js')]);
child.on('exit', function() {
if (!done) childKilled = true;
});

setTimeout(function() {
console.log('Sending SIGINT');
var child = spawn(process.argv[0], [common.fixturesDir + '/should_exit.js']);
child.stdout.once('data', function() {
child.kill('SIGINT');
setTimeout(function() {
console.log('Chance has been given to die');
done = true;
if (!childKilled) {
// Cleanup
console.log('Child did not die on SIGINT, sending SIGTERM');
child.kill('SIGTERM');
}
}, 200);
}, 200);

process.on('exit', function() {
assert.ok(childKilled);
});
child.on('exit', common.mustCall(function(exitCode, signalCode) {
assert.equal(exitCode, null);
assert.equal(signalCode, 'SIGINT');
}));

0 comments on commit 10a9c00

Please sign in to comment.