From 6a98d26c53f56fc2ea291ecad0cb653e8f77bf47 Mon Sep 17 00:00:00 2001 From: Ben Michel Date: Fri, 6 Oct 2017 10:41:48 -0700 Subject: [PATCH 1/4] test: use common.fixtures in tls test --- test/parallel/test-tls-max-send-fragment.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-tls-max-send-fragment.js b/test/parallel/test-tls-max-send-fragment.js index 1cbcb8e272d6c8..83197ba8186496 100644 --- a/test/parallel/test-tls-max-send-fragment.js +++ b/test/parallel/test-tls-max-send-fragment.js @@ -20,7 +20,10 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; +const path = require('path'); const common = require('../common'); +const fixtures = require('../common/fixtures'); + if (!common.hasCrypto) common.skip('missing crypto'); @@ -33,8 +36,8 @@ let received = 0; const maxChunk = 768; const server = tls.createServer({ - key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`), - cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`) + key: fs.readFileSync(path.join(fixtures.fixturesDir, `/keys/agent1-key.pem`)), + cert: fs.readFileSync(path.join(fixtures.fixturesDir, `/keys/agent1-cert.pem`)) }, function(c) { // Lower and upper limits assert(!c.setMaxSendFragment(511)); From 32db634b6bfcde8f825388ec908e01bfe5cb499f Mon Sep 17 00:00:00 2001 From: Ben Michel Date: Fri, 6 Oct 2017 12:25:42 -0700 Subject: [PATCH 2/4] test: use common.fixtures in tls test (use correct method) --- test/parallel/test-tls-max-send-fragment.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/parallel/test-tls-max-send-fragment.js b/test/parallel/test-tls-max-send-fragment.js index 83197ba8186496..2dde52d262543c 100644 --- a/test/parallel/test-tls-max-send-fragment.js +++ b/test/parallel/test-tls-max-send-fragment.js @@ -20,7 +20,6 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const path = require('path'); const common = require('../common'); const fixtures = require('../common/fixtures'); @@ -29,15 +28,14 @@ if (!common.hasCrypto) const assert = require('assert'); const tls = require('tls'); -const fs = require('fs'); const buf = Buffer.allocUnsafe(10000); let received = 0; const maxChunk = 768; const server = tls.createServer({ - key: fs.readFileSync(path.join(fixtures.fixturesDir, `/keys/agent1-key.pem`)), - cert: fs.readFileSync(path.join(fixtures.fixturesDir, `/keys/agent1-cert.pem`)) + key: fixtures.readSync('/keys/agent1-key.pem'), + cert: fixtures.readSync('/keys/agent1-cert.pem') }, function(c) { // Lower and upper limits assert(!c.setMaxSendFragment(511)); From 611b486b3a6db4ee46a10052624bf4f9d45ad500 Mon Sep 17 00:00:00 2001 From: Ben Michel Date: Sat, 7 Oct 2017 21:54:45 -0700 Subject: [PATCH 3/4] test: use common.fixtures in tls test (use readKey method) --- test/parallel/test-tls-max-send-fragment.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-tls-max-send-fragment.js b/test/parallel/test-tls-max-send-fragment.js index 2dde52d262543c..d9d3b65782202f 100644 --- a/test/parallel/test-tls-max-send-fragment.js +++ b/test/parallel/test-tls-max-send-fragment.js @@ -34,8 +34,8 @@ let received = 0; const maxChunk = 768; const server = tls.createServer({ - key: fixtures.readSync('/keys/agent1-key.pem'), - cert: fixtures.readSync('/keys/agent1-cert.pem') + key: fixtures.readKey('/agent1-key.pem'), + cert: fixtures.readKey('/agent1-cert.pem') }, function(c) { // Lower and upper limits assert(!c.setMaxSendFragment(511)); From 7ad1abed9de68bd72da517be4a5e36ce63a18849 Mon Sep 17 00:00:00 2001 From: Ben Michel Date: Sun, 8 Oct 2017 20:14:25 -0700 Subject: [PATCH 4/4] test: use common.fixtures in tls test (drop leading dir slash) --- test/parallel/test-tls-max-send-fragment.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-tls-max-send-fragment.js b/test/parallel/test-tls-max-send-fragment.js index d9d3b65782202f..eca995d66483b5 100644 --- a/test/parallel/test-tls-max-send-fragment.js +++ b/test/parallel/test-tls-max-send-fragment.js @@ -34,8 +34,8 @@ let received = 0; const maxChunk = 768; const server = tls.createServer({ - key: fixtures.readKey('/agent1-key.pem'), - cert: fixtures.readKey('/agent1-cert.pem') + key: fixtures.readKey('agent1-key.pem'), + cert: fixtures.readKey('agent1-cert.pem') }, function(c) { // Lower and upper limits assert(!c.setMaxSendFragment(511));