Remove uncommon functions from common module

test/common/README.md

@@ -340,11 +340,6 @@ original state after calling [`common.hijackStdOut()`][].
 
 Path to the 'root' directory. either `/` or `c:\\` (windows)
 
-### projectDir
-* [<String>]
-
-Path to the project directory.
-
 ### skip(msg)
 * `msg` [<String>]
 

test/common/index.js

@@ -69,7 +69,6 @@ exports.enoughTestCpu = Array.isArray(cpus) &&
                         (cpus.length > 1 || cpus[0].speed > 999);
 
 exports.rootDir = exports.isWindows ? 'c:\\' : '/';
-exports.projectDir = path.resolve(__dirname, '..', '..');
 
 exports.buildType = process.config.target_defaults.default_configuration;
 
@@ -824,23 +823,6 @@ exports.crashOnUnhandledRejection = function() {
              (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
 const stdWrite = {};
 function hijackStdWritable(name, listener) {
@@ -869,12 +851,3 @@ exports.hijackStdout = hijackStdWritable.bind(null, 'stdout');
 exports.hijackStderr = hijackStdWritable.bind(null, 'stderr');
 exports.restoreStdout = restoreWritable.bind(null, 'stdout');
 exports.restoreStderr = restoreWritable.bind(null, 'stderr');
-
-let fd = 2;
-exports.firstInvalidFD = function firstInvalidFD() {
-  // Get first known bad file descriptor.
-  try {
-    while (fs.fstatSync(++fd));
-  } catch (e) {}
-  return fd;
-};

test/doctool/test-make-doc.js

@@ -11,7 +11,7 @@ const assert = require('assert');
 const fs = require('fs');
 const path = require('path');
 
-const apiPath = path.resolve(common.projectDir, 'out', 'doc', 'api');
+const apiPath = path.resolve(__dirname, '..', '..', 'out', 'doc', 'api');
 const docs = fs.readdirSync(apiPath);
 assert.ok(docs.includes('_toc.html'));
 

test/parallel/test-http2-respond-file-fd-invalid.js

@@ -3,8 +3,10 @@
 const common = require('../common');
 if (!common.hasCrypto)
   common.skip('missing crypto');
-const http2 = require('http2');
+
 const assert = require('assert');
+const fs = require('fs');
+const http2 = require('http2');
 
 const {
   NGHTTP2_INTERNAL_ERROR
@@ -18,7 +20,16 @@ const errorCheck = common.expectsError({
 
 const server = http2.createServer();
 server.on('stream', (stream) => {
-  stream.respondWithFD(common.firstInvalidFD());
+  let fd = 2;
+
+  // Get first known bad file descriptor.
+  try {
+    while (fs.fstatSync(++fd));
+  } catch (e) {
+    // do nothing; we now have an invalid fd
+  }
+
+  stream.respondWithFD(fd);
   stream.on('error', common.mustCall(errorCheck));
 });
 server.listen(0, () => {

test/sequential/test-async-wrap-getasyncid.js

@@ -247,13 +247,27 @@ if (common.hasCrypto) { // eslint-disable-line crypto-check
 
 {
   // Do our best to grab a tty fd.
-  const tty_fd = common.getTTYfd();
-  if (tty_fd >= 0) {
+  function getTTYfd() {
+    const tty = require('tty');
+    let ttyFd = [0, 1, 2].find(tty.isatty);
+    if (ttyFd === undefined) {
+      try {
+        ttyFd = fs.openSync('/dev/tty');
+      } catch (e) {
+        // There aren't any tty fd's available to use.
+        return -1;
+      }
+    }
+    return ttyFd;
+  }
+
+  const ttyFd = getTTYfd();
+  if (ttyFd >= 0) {
     const tty_wrap = process.binding('tty_wrap');
     // fd may still be invalid, so guard against it.
     const handle = (() => {
       try {
-        return new tty_wrap.TTY(tty_fd, false);
+        return new tty_wrap.TTY(ttyFd, false);
       } catch (e) {
         return null;
       }