1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: remove getTTYfd() from common module

Browse Source 
common.getTTYfd() is used in one test only. Move it's definition to that
test and out of the common module.

PR-URL: https://github.com/nodejs/node/pull/17781
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
This commit is contained in:
Rich Trott 2017-12-19 22:03:19 -08:00
parent fc8e8215f6
commit ddf3655f2b
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/common/index.js
View File

@ -823,23 +823,6 @@ exports.crashOnUnhandledRejection = function() {
(err) => process.nextTick(() => { throw err; })); (err) => process.nextTick(() => { throw err; }));
}; };
exports.getTTYfd = function getTTYfd() {
const tty = require('tty');
let tty_fd = 0;
if (!tty.isatty(tty_fd)) tty_fd++;
else if (!tty.isatty(tty_fd)) tty_fd++;
else if (!tty.isatty(tty_fd)) tty_fd++;
else {
try {
tty_fd = fs.openSync('/dev/tty');
} catch (e) {
// There aren't any tty fd's available to use.
return -1;
}
}
return tty_fd;
};
// Hijack stdout and stderr // Hijack stdout and stderr
const stdWrite = {}; const stdWrite = {};
function hijackStdWritable(name, listener) { function hijackStdWritable(name, listener) {

19
test/sequential/test-async-wrap-getasyncid.js
View File

@ -247,7 +247,24 @@ if (common.hasCrypto) { // eslint-disable-line crypto-check
{ {
// Do our best to grab a tty fd. // Do our best to grab a tty fd.
const tty_fd = common.getTTYfd(); function getTTYfd() {
const tty = require('tty');
let tty_fd = 0;
if (!tty.isatty(tty_fd)) tty_fd++;
else if (!tty.isatty(tty_fd)) tty_fd++;
else if (!tty.isatty(tty_fd)) tty_fd++;
else {
try {
tty_fd = fs.openSync('/dev/tty');
} catch (e) {
// There aren't any tty fd's available to use.
return -1;
}
}
return tty_fd;
}
const tty_fd = getTTYfd();
if (tty_fd >= 0) { if (tty_fd >= 0) {
const tty_wrap = process.binding('tty_wrap'); const tty_wrap = process.binding('tty_wrap');
// fd may still be invalid, so guard against it. // fd may still be invalid, so guard against it.