From 3bf3dc465fcbc33529e0aac3bef0aa39954d87d3 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sat, 2 Dec 2017 01:26:35 -0800 Subject: [PATCH] test: remove fixturesDir from common module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove common.fixturesDir. All tests now use the the common/fixtures module instead. PR-URL: https://github.com/nodejs/node/pull/17400 Backport-PR-URL: https://github.com/nodejs/node/pull/17770 Reviewed-By: Colin Ihrig Reviewed-By: Jon Moss Reviewed-By: Anna Henningsen Reviewed-By: Luigi Pinca Reviewed-By: Benjamin Gruenbaum Reviewed-By: Lance Ball Reviewed-By: Michael Dawson Reviewed-By: Tobias Nießen --- test/common/README.md | 5 ----- test/common/index.js | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/test/common/README.md b/test/common/README.md index 5e69db69a4673c..0e82bb1381f745 100644 --- a/test/common/README.md +++ b/test/common/README.md @@ -124,11 +124,6 @@ Returns a new promise that will propagate `promise` resolution or rejection if that happens within the `timeoutMs` timespan, or rejects with `error` as a reason otherwise. -### fixturesDir -* return [<String>] - -Path to the 'fixtures' directory. - ### getArrayBufferViews(buf) * `buf` [<Buffer>] * return [<ArrayBufferView[]>] diff --git a/test/common/index.js b/test/common/index.js index 7e94bc766de369..7b44b4002010c5 100644 --- a/test/common/index.js +++ b/test/common/index.js @@ -36,8 +36,6 @@ const testRoot = process.env.NODE_TEST_DIR ? const noop = () => {}; -exports.fixturesDir = fixturesDir; - // Using a `.` prefixed name, which is the convention for "hidden" on POSIX, // gets tools to ignore it by default or by simple rules, especially eslint. let tmpDirName = '.tmp'; @@ -314,7 +312,7 @@ exports.childShouldThrowAndAbort = function() { exports.ddCommand = function(filename, kilobytes) { if (exports.isWindows) { - const p = path.resolve(exports.fixturesDir, 'create-file.js'); + const p = path.resolve(fixturesDir, 'create-file.js'); return `"${process.argv[0]}" "${p}" "${filename}" ${kilobytes * 1024}`; } else { return `dd if=/dev/zero of="${filename}" bs=1024 count=${kilobytes}`;