From f5a085e4545028f5d9919161024df188bed3011c Mon Sep 17 00:00:00 2001 From: Cheyenne Arrowsmith Date: Fri, 6 Oct 2017 09:26:38 -0700 Subject: [PATCH 1/5] test: replaced common.fixturesDir with common.fixtures --- test/parallel/test-tls-multi-key.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/parallel/test-tls-multi-key.js b/test/parallel/test-tls-multi-key.js index 6e1a3c8777eeba..ecfd275552e663 100644 --- a/test/parallel/test-tls-multi-key.js +++ b/test/parallel/test-tls-multi-key.js @@ -30,12 +30,12 @@ const fs = require('fs'); const options = { key: [ - fs.readFileSync(`${common.fixturesDir}/keys/ec-key.pem`), - fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`), + fs.readFileSync(`${common.fixtures}/keys/ec-key.pem`), + fs.readFileSync(`${common.fixtures}/keys/agent1-key.pem`), ], cert: [ - fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`), - fs.readFileSync(`${common.fixturesDir}/keys/ec-cert.pem`) + fs.readFileSync(`${common.fixtures}/keys/agent1-cert.pem`), + fs.readFileSync(`${common.fixtures}/keys/ec-cert.pem`) ] }; From 8110afd3d8924b5ee58328d798439daed2b86583 Mon Sep 17 00:00:00 2001 From: Cheyenne Arrowsmith Date: Fri, 6 Oct 2017 09:51:30 -0700 Subject: [PATCH 2/5] test: added fixtures.path() to const options --- test/parallel/test-tls-multi-key.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/parallel/test-tls-multi-key.js b/test/parallel/test-tls-multi-key.js index ecfd275552e663..697fcb65f1bec4 100644 --- a/test/parallel/test-tls-multi-key.js +++ b/test/parallel/test-tls-multi-key.js @@ -21,6 +21,7 @@ 'use strict'; const common = require('../common'); +const fixtures = require('../common/fixtures'); if (!common.hasCrypto) common.skip('missing crypto'); @@ -30,12 +31,12 @@ const fs = require('fs'); const options = { key: [ - fs.readFileSync(`${common.fixtures}/keys/ec-key.pem`), - fs.readFileSync(`${common.fixtures}/keys/agent1-key.pem`), + fs.readFileSync(fixtures.path('/keys/ec-key.pem')), + fs.readFileSync(fixtures.path('/keys/agent1-key.pem')), ], cert: [ - fs.readFileSync(`${common.fixtures}/keys/agent1-cert.pem`), - fs.readFileSync(`${common.fixtures}/keys/ec-cert.pem`) + fs.readFileSync(fixtures.path('/keys/agent1-cert.pem')), + fs.readFileSync(fixtures.path('/keys/ec-cert.pem')), ] }; From 6dd3bb78aaf8650cfc0807bd05e41447129c724f Mon Sep 17 00:00:00 2001 From: Cheyenne Arrowsmith Date: Tue, 10 Oct 2017 05:33:15 -0700 Subject: [PATCH 3/5] test: replced fixturesDir with fixtures.readKey() --- test/parallel/test-tls-multi-key.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/test/parallel/test-tls-multi-key.js b/test/parallel/test-tls-multi-key.js index 697fcb65f1bec4..c0b2f5b136c091 100644 --- a/test/parallel/test-tls-multi-key.js +++ b/test/parallel/test-tls-multi-key.js @@ -1,4 +1,4 @@ -// Copyright Joyent, Inc. and other Node contributors. +no// Copyright Joyent, Inc. and other Node contributors. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,16 +27,15 @@ if (!common.hasCrypto) const assert = require('assert'); const tls = require('tls'); -const fs = require('fs'); const options = { key: [ - fs.readFileSync(fixtures.path('/keys/ec-key.pem')), - fs.readFileSync(fixtures.path('/keys/agent1-key.pem')), + fixtures.readKey('ec-key.pem'), + fixtures.readKey('agent1-key.pem'), ], cert: [ - fs.readFileSync(fixtures.path('/keys/agent1-cert.pem')), - fs.readFileSync(fixtures.path('/keys/ec-cert.pem')), + fixtures.readKey('agent1-cert.pem'), + fixtures.readKey('ec-cert.pem'), ] }; From 6e84d1ffd448043afbae0caf823b9c7b4f1c913a Mon Sep 17 00:00:00 2001 From: Cheyenne Arrowsmith Date: Tue, 10 Oct 2017 06:32:52 -0700 Subject: [PATCH 4/5] fixed waywrad characters --- test/parallel/test-tls-multi-key.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parallel/test-tls-multi-key.js b/test/parallel/test-tls-multi-key.js index c0b2f5b136c091..9efeb05b5ab554 100644 --- a/test/parallel/test-tls-multi-key.js +++ b/test/parallel/test-tls-multi-key.js @@ -1,4 +1,4 @@ -no// Copyright Joyent, Inc. and other Node contributors. +// Copyright Joyent, Inc. and other Node contributors. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the From 391f0f11d93b5cd4f2bc904b0862238402a7693d Mon Sep 17 00:00:00 2001 From: Cheyenne Arrowsmith Date: Wed, 11 Oct 2017 08:36:28 -0400 Subject: [PATCH 5/5] moved fixtures declaration to after common.hasCrypto check --- test/parallel/test-tls-multi-key.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parallel/test-tls-multi-key.js b/test/parallel/test-tls-multi-key.js index 9efeb05b5ab554..8c0722f858c748 100644 --- a/test/parallel/test-tls-multi-key.js +++ b/test/parallel/test-tls-multi-key.js @@ -21,10 +21,10 @@ 'use strict'; const common = require('../common'); -const fixtures = require('../common/fixtures'); if (!common.hasCrypto) common.skip('missing crypto'); +const fixtures = require('../common/fixtures'); const assert = require('assert'); const tls = require('tls');