From 79de61659bcf68f67ab48425ca69d7daca496070 Mon Sep 17 00:00:00 2001 From: tobyfarley Date: Fri, 6 Oct 2017 11:12:24 -0600 Subject: [PATCH 1/2] test: use fixtures in tls-friendly-error-message --- test/parallel/test-tls-friendly-error-message.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-tls-friendly-error-message.js b/test/parallel/test-tls-friendly-error-message.js index 644b298fb9a40c..60c566c599b011 100644 --- a/test/parallel/test-tls-friendly-error-message.js +++ b/test/parallel/test-tls-friendly-error-message.js @@ -28,8 +28,8 @@ const assert = require('assert'); const tls = require('tls'); const fs = require('fs'); -const key = fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`); -const cert = fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`); +const key = fs.readFileSync(`${common.fixtures}/keys/agent1-key.pem`); +const cert = fs.readFileSync(`${common.fixtures}/keys/agent1-cert.pem`); tls.createServer({ key: key, cert: cert }, common.mustCall(function(conn) { conn.end(); From b2e22e0b575bddf44a27e744f1bc97f5e35a1df9 Mon Sep 17 00:00:00 2001 From: tobyfarley Date: Mon, 9 Oct 2017 09:57:02 -0600 Subject: [PATCH 2/2] test: tls-friendly-error-message use fixtures mod --- test/parallel/test-tls-friendly-error-message.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/parallel/test-tls-friendly-error-message.js b/test/parallel/test-tls-friendly-error-message.js index 60c566c599b011..2989837b19f38e 100644 --- a/test/parallel/test-tls-friendly-error-message.js +++ b/test/parallel/test-tls-friendly-error-message.js @@ -24,12 +24,12 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); +const fixtures = require('../common/fixtures'); const assert = require('assert'); const tls = require('tls'); -const fs = require('fs'); -const key = fs.readFileSync(`${common.fixtures}/keys/agent1-key.pem`); -const cert = fs.readFileSync(`${common.fixtures}/keys/agent1-cert.pem`); +const key = fixtures.readKey('agent1-key.pem'); +const cert = fixtures.readKey('agent1-cert.pem'); tls.createServer({ key: key, cert: cert }, common.mustCall(function(conn) { conn.end();