mirror of https://github.com/lukechilds/node.git
Browse Source
Adds the ability to stop execution of the current REPL command when receiving SIGINT. This applies only to the default eval function. Fixes: https://github.com/nodejs/node/issues/6612 PR-URL: https://github.com/nodejs/node/pull/6635 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>v6.x
Anna Henningsen
9 years ago
committed by
Jeremiah Senkpiel
5 changed files with 151 additions and 6 deletions
@ -0,0 +1,50 @@ |
|||
'use strict'; |
|||
const common = require('../common'); |
|||
const assert = require('assert'); |
|||
|
|||
const spawn = require('child_process').spawn; |
|||
|
|||
if (process.platform === 'win32') { |
|||
// No way to send CTRL_C_EVENT to processes from JS right now.
|
|||
common.skip('platform not supported'); |
|||
return; |
|||
} |
|||
|
|||
process.env.REPL_TEST_PPID = process.pid; |
|||
const child = spawn(process.execPath, [ '-i' ], { |
|||
stdio: [null, null, 2] |
|||
}); |
|||
|
|||
let stdout = ''; |
|||
child.stdout.setEncoding('utf8'); |
|||
child.stdout.pipe(process.stdout); |
|||
child.stdout.on('data', function(c) { |
|||
stdout += c; |
|||
}); |
|||
|
|||
child.stdin.write = ((original) => { |
|||
return (chunk) => { |
|||
process.stderr.write(chunk); |
|||
return original.call(child.stdin, chunk); |
|||
}; |
|||
})(child.stdin.write); |
|||
|
|||
child.stdout.once('data', common.mustCall(() => { |
|||
process.on('SIGUSR2', common.mustCall(() => { |
|||
process.kill(child.pid, 'SIGINT'); |
|||
child.stdout.once('data', common.mustCall(() => { |
|||
// Make sure REPL still works.
|
|||
child.stdin.end('"foobar"\n'); |
|||
})); |
|||
})); |
|||
|
|||
child.stdin.write('process.kill(+process.env.REPL_TEST_PPID, "SIGUSR2");' + |
|||
'vm.runInThisContext("while(true){}", ' + |
|||
'{ breakOnSigint: true });\n'); |
|||
})); |
|||
|
|||
child.on('close', function(code) { |
|||
assert.strictEqual(code, 0); |
|||
assert.notStrictEqual(stdout.indexOf('Script execution interrupted.'), -1); |
|||
assert.notStrictEqual(stdout.indexOf('foobar'), -1); |
|||
}); |
@ -0,0 +1,50 @@ |
|||
'use strict'; |
|||
const common = require('../common'); |
|||
const assert = require('assert'); |
|||
|
|||
const spawn = require('child_process').spawn; |
|||
|
|||
if (process.platform === 'win32') { |
|||
// No way to send CTRL_C_EVENT to processes from JS right now.
|
|||
common.skip('platform not supported'); |
|||
return; |
|||
} |
|||
|
|||
process.env.REPL_TEST_PPID = process.pid; |
|||
const child = spawn(process.execPath, [ '-i' ], { |
|||
stdio: [null, null, 2] |
|||
}); |
|||
|
|||
let stdout = ''; |
|||
child.stdout.setEncoding('utf8'); |
|||
child.stdout.pipe(process.stdout); |
|||
child.stdout.on('data', function(c) { |
|||
stdout += c; |
|||
}); |
|||
|
|||
child.stdin.write = ((original) => { |
|||
return (chunk) => { |
|||
process.stderr.write(chunk); |
|||
return original.call(child.stdin, chunk); |
|||
}; |
|||
})(child.stdin.write); |
|||
|
|||
child.stdout.once('data', common.mustCall(() => { |
|||
process.on('SIGUSR2', common.mustCall(() => { |
|||
process.kill(child.pid, 'SIGINT'); |
|||
child.stdout.once('data', common.mustCall(() => { |
|||
// Make sure state from before the interruption is still available.
|
|||
child.stdin.end('a*2*3*7\n'); |
|||
})); |
|||
})); |
|||
|
|||
child.stdin.write('a = 1001;' + |
|||
'process.kill(+process.env.REPL_TEST_PPID, "SIGUSR2");' + |
|||
'while(true){}\n'); |
|||
})); |
|||
|
|||
child.on('close', function(code) { |
|||
assert.strictEqual(code, 0); |
|||
assert.notStrictEqual(stdout.indexOf('Script execution interrupted.\n'), -1); |
|||
assert.notStrictEqual(stdout.indexOf('42042\n'), -1); |
|||
}); |
Loading…
Reference in new issue