From 1fc5c29f28105b19b81e01b9deec76eef49fefde Mon Sep 17 00:00:00 2001 From: Trevor Norris Date: Thu, 29 Jun 2017 15:20:47 -0600 Subject: [PATCH] test,async_hooks: skip whether TTY is available If TTY isn't available then the test will always fail. Also use the already available process.stdin instead of opening another ReadStream. PR-URL: https://github.com/nodejs/node/pull/13991 Fixes: https://github.com/nodejs/node/issues/13984 Reviewed-By: Anna Henningsen Reviewed-By: James M Snell Reviewed-By: Refael Ackermann --- test/async-hooks/test-ttywrap.readstream.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/test/async-hooks/test-ttywrap.readstream.js b/test/async-hooks/test-ttywrap.readstream.js index 725176f0887ef6..65853da1f7ab17 100644 --- a/test/async-hooks/test-ttywrap.readstream.js +++ b/test/async-hooks/test-ttywrap.readstream.js @@ -1,4 +1,5 @@ 'use strict'; + const common = require('../common'); const assert = require('assert'); @@ -10,31 +11,33 @@ const { checkInvocations } = require('./hook-checks'); const hooks = initHooks(); hooks.enable(); +if (!process.stdin.isTTY) + return common.skip('no valid readable TTY available'); + // test specific setup -const { ReadStream } = require('tty'); const checkInitOpts = { init: 1 }; const checkEndedOpts = { init: 1, before: 1, after: 1, destroy: 1 }; // test code // // listen to stdin except on Windows -const targetFD = common.isWindows ? 1 : 0; -const ttyStream = new ReadStream(targetFD); const activities = hooks.activitiesOfTypes('TTYWRAP'); assert.strictEqual(activities.length, 1); + const tty = activities[0]; assert.strictEqual(tty.type, 'TTYWRAP'); assert.strictEqual(typeof tty.uid, 'number'); assert.strictEqual(typeof tty.triggerAsyncId, 'number'); checkInvocations(tty, checkInitOpts, 'when tty created'); + const delayedOnCloseHandler = common.mustCall(() => { checkInvocations(tty, checkEndedOpts, 'when tty ended'); }); -ttyStream.on('error', (err) => assert.fail(err)); -ttyStream.on('close', common.mustCall(() => +process.stdin.on('error', (err) => assert.fail(err)); +process.stdin.on('close', common.mustCall(() => tick(2, delayedOnCloseHandler) )); -ttyStream.destroy(); +process.stdin.destroy(); checkInvocations(tty, checkInitOpts, 'when tty.end() was invoked'); process.on('exit', () => {