From 58c3ecb6d2f8fc4eeeb63762bb536e5221dba0cc Mon Sep 17 00:00:00 2001 From: Adri Van Houdt Date: Mon, 6 Nov 2017 15:03:43 +0000 Subject: [PATCH 1/2] test: replace common.fixturesDir with fixtures.path() --- test/parallel/test-tls-getprotocol.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-tls-getprotocol.js b/test/parallel/test-tls-getprotocol.js index dd96aa6f7494a6..d81bbe95b69527 100644 --- a/test/parallel/test-tls-getprotocol.js +++ b/test/parallel/test-tls-getprotocol.js @@ -3,8 +3,12 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); +// This test ensures that `getProtocol` returns the right protocol +// from a TLS connection + const assert = require('assert'); const tls = require('tls'); +const fixtures = require('../common/fixtures'); const fs = require('fs'); const clientConfigs = [ @@ -14,8 +18,8 @@ const clientConfigs = [ ]; const serverConfig = { - key: fs.readFileSync(`${common.fixturesDir}/keys/agent2-key.pem`), - cert: fs.readFileSync(`${common.fixturesDir}/keys/agent2-cert.pem`) + key: fs.readFileSync(fixtures.path('/keys/agent2-key.pem')), + cert: fs.readFileSync(fixtures.path('/keys/agent2-cert.pem')) }; const server = tls.createServer(serverConfig, common.mustCall(function() { From f844a3c5eb0b272a20da164922bd2c7ac61d5c27 Mon Sep 17 00:00:00 2001 From: Adri Van Houdt Date: Mon, 6 Nov 2017 15:34:11 +0000 Subject: [PATCH 2/2] test: use fixtures.readSync --- test/parallel/test-tls-getprotocol.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/parallel/test-tls-getprotocol.js b/test/parallel/test-tls-getprotocol.js index d81bbe95b69527..bf75eb8a398647 100644 --- a/test/parallel/test-tls-getprotocol.js +++ b/test/parallel/test-tls-getprotocol.js @@ -9,7 +9,6 @@ if (!common.hasCrypto) const assert = require('assert'); const tls = require('tls'); const fixtures = require('../common/fixtures'); -const fs = require('fs'); const clientConfigs = [ { secureProtocol: 'TLSv1_method', version: 'TLSv1' }, @@ -18,8 +17,8 @@ const clientConfigs = [ ]; const serverConfig = { - key: fs.readFileSync(fixtures.path('/keys/agent2-key.pem')), - cert: fs.readFileSync(fixtures.path('/keys/agent2-cert.pem')) + key: fixtures.readSync('/keys/agent2-key.pem'), + cert: fixtures.readSync('/keys/agent2-cert.pem') }; const server = tls.createServer(serverConfig, common.mustCall(function() {