Skip to content
Closed
Changes from all commits
Commits
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
test: refactor test-repl-sigint-nested-eval
* remove debugging code that prints child stdout
* indexOf() -> includes()
* improved messages on assertion failures
  • Loading branch information
Trott committed Feb 10, 2017
commit 010835d38c9df3648496a044904b5f9b742ccd45
18 changes: 8 additions & 10 deletions test/parallel/test-repl-sigint-nested-eval.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,10 @@ const child = spawn(process.execPath, [ '-i' ], {

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');
Expand All @@ -45,6 +37,12 @@ child.stdout.once('data', common.mustCall(() => {

child.on('close', function(code) {
assert.strictEqual(code, 0);
assert.notStrictEqual(stdout.indexOf('Script execution interrupted.'), -1);
assert.notStrictEqual(stdout.indexOf('foobar'), -1);
assert.ok(
stdout.includes('Script execution interrupted.'),
`Expected stdout to contain "Script execution interrupted.", got ${stdout}`
);
assert.ok(
stdout.includes('foobar'),
`Expected stdout to contain "foobar", got ${stdout}`
);
});