From dcde450cfe63a2347ee9df462db9a488256a9bb3 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sat, 2 Dec 2017 01:26:03 -0800 Subject: [PATCH 1/2] test: remove common.fixturesDir from tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use common/fixtures module instead of common.fixturesDir. PR-URL: https://github.com/nodejs/node/pull/17400 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/parallel/test-tls-interleave.js | 10 ++++------ test/parallel/test-tls-invoke-queued.js | 7 ++++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/test/parallel/test-tls-interleave.js b/test/parallel/test-tls-interleave.js index d704a35e6881df..c82d7140fce887 100644 --- a/test/parallel/test-tls-interleave.js +++ b/test/parallel/test-tls-interleave.js @@ -26,15 +26,13 @@ if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); - const tls = require('tls'); -const fs = require('fs'); +const fixtures = require('../common/fixtures'); -const dir = common.fixturesDir; -const options = { key: fs.readFileSync(`${dir}/test_key.pem`), - cert: fs.readFileSync(`${dir}/test_cert.pem`), - ca: [ fs.readFileSync(`${dir}/test_ca.pem`) ] }; +const options = { key: fixtures.readSync('test_key.pem'), + cert: fixtures.readSync('test_cert.pem'), + ca: [ fixtures.readSync('test_ca.pem') ] }; const writes = [ 'some server data', diff --git a/test/parallel/test-tls-invoke-queued.js b/test/parallel/test-tls-invoke-queued.js index b1027dd943386c..578ee4cbfd76f2 100644 --- a/test/parallel/test-tls-invoke-queued.js +++ b/test/parallel/test-tls-invoke-queued.js @@ -26,14 +26,15 @@ if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); -const fs = require('fs'); const tls = require('tls'); +const fixtures = require('../common/fixtures'); + let received = ''; const server = tls.createServer({ - key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`), - cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`) + key: fixtures.readKey('agent1-key.pem'), + cert: fixtures.readKey('agent1-cert.pem') }, common.mustCall(function(c) { c._write('hello ', null, common.mustCall(function() { c._write('world!', null, common.mustCall(function() { From b1306aae31f78fff070385003df79160f8f8a83b Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sat, 2 Dec 2017 01:26:35 -0800 Subject: [PATCH 2/2] 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 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 51e27f21e5a02d..4ef57ad2899b90 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}`;