diff options
author | Rich Trott <rtrott@gmail.com> | 2017-12-02 01:26:03 -0800 |
---|---|---|
committer | Rich Trott <rtrott@gmail.com> | 2017-12-03 20:12:40 -0800 |
commit | f9660b71668c2edb20d13760a9a5bcbb76a20fbd (patch) | |
tree | 78716217f724a20660d25a51d0ed1d28c800b420 | |
parent | c84710d062dfa4b39f0aa819a61c91d513ab5d1b (diff) | |
download | android-node-v8-f9660b71668c2edb20d13760a9a5bcbb76a20fbd.tar.gz android-node-v8-f9660b71668c2edb20d13760a9a5bcbb76a20fbd.tar.bz2 android-node-v8-f9660b71668c2edb20d13760a9a5bcbb76a20fbd.zip |
test: remove common.fixturesDir from tests
Use common/fixtures module instead of common.fixturesDir.
PR-URL: https://github.com/nodejs/node/pull/17400
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Lance Ball <lball@redhat.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
-rw-r--r-- | test/parallel/test-tls-interleave.js | 10 | ||||
-rw-r--r-- | test/parallel/test-tls-invoke-queued.js | 7 |
2 files changed, 8 insertions, 9 deletions
diff --git a/test/parallel/test-tls-interleave.js b/test/parallel/test-tls-interleave.js index d704a35e68..c82d7140fc 100644 --- a/test/parallel/test-tls-interleave.js +++ b/test/parallel/test-tls-interleave.js @@ -26,15 +26,13 @@ if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); - const tls = require('tls'); -const fs = require('fs'); +const fixtures = require('../common/fixtures'); -const dir = common.fixturesDir; -const options = { key: fs.readFileSync(`${dir}/test_key.pem`), - cert: fs.readFileSync(`${dir}/test_cert.pem`), - ca: [ fs.readFileSync(`${dir}/test_ca.pem`) ] }; +const options = { key: fixtures.readSync('test_key.pem'), + cert: fixtures.readSync('test_cert.pem'), + ca: [ fixtures.readSync('test_ca.pem') ] }; const writes = [ 'some server data', diff --git a/test/parallel/test-tls-invoke-queued.js b/test/parallel/test-tls-invoke-queued.js index b1027dd943..578ee4cbfd 100644 --- a/test/parallel/test-tls-invoke-queued.js +++ b/test/parallel/test-tls-invoke-queued.js @@ -26,14 +26,15 @@ if (!common.hasCrypto) common.skip('missing crypto'); const assert = require('assert'); -const fs = require('fs'); const tls = require('tls'); +const fixtures = require('../common/fixtures'); + let received = ''; const server = tls.createServer({ - key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`), - cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`) + key: fixtures.readKey('agent1-key.pem'), + cert: fixtures.readKey('agent1-cert.pem') }, common.mustCall(function(c) { c._write('hello ', null, common.mustCall(function() { c._write('world!', null, common.mustCall(function() { |