From 2c328859e0cad67559e30845ad4469ffc86aa8e8 Mon Sep 17 00:00:00 2001 From: Sean Cox Date: Fri, 6 Oct 2017 10:18:35 -0700 Subject: [PATCH 1/4] test: replaced common.fixturesDir with common.fixtures module usage --- test/parallel/test-https-client-get-url.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-https-client-get-url.js b/test/parallel/test-https-client-get-url.js index 705e779aacb762..f0613527fa5610 100644 --- a/test/parallel/test-https-client-get-url.js +++ b/test/parallel/test-https-client-get-url.js @@ -21,6 +21,7 @@ 'use strict'; const common = require('../common'); +const fixtures = require('../common/fixtures'); if (!common.hasCrypto) common.skip('missing crypto'); @@ -35,8 +36,8 @@ const url = require('url'); const URL = url.URL; const options = { - key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`), - cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`) + key: fs.readFileSync(`${fixtures.fixturesDir}/keys/agent1-key.pem`), + cert: fs.readFileSync(`${fixtures.fixturesDir}/keys/agent1-cert.pem`) }; const server = https.createServer(options, common.mustCall((req, res) => { From 535cd51286f071cba77a335a50678f3d45f49be2 Mon Sep 17 00:00:00 2001 From: Sean Cox Date: Fri, 6 Oct 2017 11:34:09 -0700 Subject: [PATCH 2/4] test: replaced common.fixturesDir with common.fixtures module --- test/parallel/test-https-client-get-url.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-https-client-get-url.js b/test/parallel/test-https-client-get-url.js index f0613527fa5610..32dd4c8e2baa29 100644 --- a/test/parallel/test-https-client-get-url.js +++ b/test/parallel/test-https-client-get-url.js @@ -36,8 +36,8 @@ const url = require('url'); const URL = url.URL; const options = { - key: fs.readFileSync(`${fixtures.fixturesDir}/keys/agent1-key.pem`), - cert: fs.readFileSync(`${fixtures.fixturesDir}/keys/agent1-cert.pem`) + key: fixtures.readKey('agent1-key.pem'), + cert: fixtures.readSync('keys/agent1-cert.pem') }; const server = https.createServer(options, common.mustCall((req, res) => { From ddc5cf25c21441a16e02ed18894b568e6d5866f3 Mon Sep 17 00:00:00 2001 From: Sean Cox Date: Fri, 6 Oct 2017 11:41:21 -0700 Subject: [PATCH 3/4] test: removed fs import since no longer needed --- test/parallel/test-https-client-get-url.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/parallel/test-https-client-get-url.js b/test/parallel/test-https-client-get-url.js index 32dd4c8e2baa29..bfac7e996366ee 100644 --- a/test/parallel/test-https-client-get-url.js +++ b/test/parallel/test-https-client-get-url.js @@ -30,7 +30,6 @@ process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; const assert = require('assert'); const https = require('https'); -const fs = require('fs'); const url = require('url'); const URL = url.URL; From 8e0efc5ba5cc6ef2089f7302aff39f74fdeaf342 Mon Sep 17 00:00:00 2001 From: Sean Cox Date: Fri, 6 Oct 2017 11:58:26 -0700 Subject: [PATCH 4/4] test: changed readSync to readKey for the cert for consistency --- test/parallel/test-https-client-get-url.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parallel/test-https-client-get-url.js b/test/parallel/test-https-client-get-url.js index bfac7e996366ee..56a6fe6d18641a 100644 --- a/test/parallel/test-https-client-get-url.js +++ b/test/parallel/test-https-client-get-url.js @@ -36,7 +36,7 @@ const URL = url.URL; const options = { key: fixtures.readKey('agent1-key.pem'), - cert: fixtures.readSync('keys/agent1-cert.pem') + cert: fixtures.readKey('agent1-cert.pem') }; const server = https.createServer(options, common.mustCall((req, res) => {