From 010835d38c9df3648496a044904b5f9b742ccd45 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Fri, 10 Feb 2017 13:54:41 -0800 Subject: [PATCH] test: refactor test-repl-sigint-nested-eval * remove debugging code that prints child stdout * indexOf() -> includes() * improved messages on assertion failures --- test/parallel/test-repl-sigint-nested-eval.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/test/parallel/test-repl-sigint-nested-eval.js b/test/parallel/test-repl-sigint-nested-eval.js index 1bb09ba3963f3e..030c86be8e8dd4 100644 --- a/test/parallel/test-repl-sigint-nested-eval.js +++ b/test/parallel/test-repl-sigint-nested-eval.js @@ -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'); @@ -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}` + ); });