From dc66f9e845b29648abc1a4a38190ddffd31e28c3 Mon Sep 17 00:00:00 2001 From: Mike Fleming Date: Fri, 6 Oct 2017 09:47:12 -0700 Subject: [PATCH 1/3] test: replaces fixturesDir with fixtures behold, my first commit to node.js coming from node interactive in Vancouver. this commit updates the common.fixturesDir method in the https-timeout test. --- test/parallel/test-https-timeout.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-https-timeout.js b/test/parallel/test-https-timeout.js index ad1fcb3ed232e4..96c9ab1328f0a2 100644 --- a/test/parallel/test-https-timeout.js +++ b/test/parallel/test-https-timeout.js @@ -30,8 +30,8 @@ const https = require('https'); const fs = require('fs'); const options = { - key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`), - cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`) + key: fs.readFileSync(`${common.fixtures}/keys/agent1-key.pem`), + cert: fs.readFileSync(`${common.fixtures}/keys/agent1-cert.pem`) }; // a server that never replies From 3282e666bfe6df181afce33c48840eeb8518a8ec Mon Sep 17 00:00:00 2001 From: Mike Fleming Date: Wed, 11 Oct 2017 11:36:40 -0500 Subject: [PATCH 2/3] requires fixtures, calls readkey --- test/parallel/test-https-timeout.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-https-timeout.js b/test/parallel/test-https-timeout.js index 96c9ab1328f0a2..3fe314d7fc254d 100644 --- a/test/parallel/test-https-timeout.js +++ b/test/parallel/test-https-timeout.js @@ -21,6 +21,7 @@ 'use strict'; const common = require('../common'); +const fixtures = require('../common/fixtures'); if (!common.hasCrypto) common.skip('missing crypto'); @@ -30,8 +31,8 @@ const https = require('https'); const fs = require('fs'); const options = { - key: fs.readFileSync(`${common.fixtures}/keys/agent1-key.pem`), - cert: fs.readFileSync(`${common.fixtures}/keys/agent1-cert.pem`) + key: fixtures.readKey('agent1-key.pem'), + cert: fixtures.readKey('agent1-cert.pem') }; // a server that never replies From d35addee728fc30b40e9311fe5f16bba9b3300c5 Mon Sep 17 00:00:00 2001 From: Mike Fleming Date: Fri, 13 Oct 2017 14:46:42 -0500 Subject: [PATCH 3/3] removes fs module, requires fixtures after crypto check --- test/parallel/test-https-timeout.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/parallel/test-https-timeout.js b/test/parallel/test-https-timeout.js index 3fe314d7fc254d..e034adc39d2899 100644 --- a/test/parallel/test-https-timeout.js +++ b/test/parallel/test-https-timeout.js @@ -21,15 +21,13 @@ 'use strict'; const common = require('../common'); -const fixtures = require('../common/fixtures'); if (!common.hasCrypto) common.skip('missing crypto'); +const fixtures = require('../common/fixtures'); const https = require('https'); -const fs = require('fs'); - const options = { key: fixtures.readKey('agent1-key.pem'), cert: fixtures.readKey('agent1-cert.pem')