diff options
author | James M Snell <jasnell@gmail.com> | 2017-07-17 15:33:46 -0700 |
---|---|---|
committer | James M Snell <jasnell@gmail.com> | 2017-08-07 18:00:57 -0700 |
commit | 7535a94c8a54bb6346c8e60dbae1c32d6f508212 (patch) | |
tree | e455c85470c3256bb064516a8fa8e2c4c059532b /test/parallel/test-tls-securepair-server.js | |
parent | 7192e913f703c96eddff697c4ba0daef87930776 (diff) | |
download | android-node-v8-7535a94c8a54bb6346c8e60dbae1c32d6f508212.tar.gz android-node-v8-7535a94c8a54bb6346c8e60dbae1c32d6f508212.tar.bz2 android-node-v8-7535a94c8a54bb6346c8e60dbae1c32d6f508212.zip |
test: begin normalizing fixtures use
Adds a new `../common/fixtures' module to begin normalizing
`test/fixtures` use. Our test code is a bit inconsistent with
regards to use of the fixtures directory. Some code uses
`path.join()`, some code uses string concats, some other
code uses template strings, etc. In mnay cases, significant
duplication of code is seen when accessing fixture files, etc.
This updates many (but by no means all) of the tests in the
test suite to use the new consistent API. There are still
many more to update, which would make an excelent Code-n-Learn
exercise.
PR-URL: https://github.com/nodejs/node/pull/14332
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Diffstat (limited to 'test/parallel/test-tls-securepair-server.js')
-rw-r--r-- | test/parallel/test-tls-securepair-server.js | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/test/parallel/test-tls-securepair-server.js b/test/parallel/test-tls-securepair-server.js index 3e61f86605..9dceb4c4e4 100644 --- a/test/parallel/test-tls-securepair-server.js +++ b/test/parallel/test-tls-securepair-server.js @@ -29,13 +29,12 @@ if (!common.opensslCli) const assert = require('assert'); const tls = require('tls'); -const join = require('path').join; const net = require('net'); -const fs = require('fs'); const spawn = require('child_process').spawn; +const fixtures = require('../common/fixtures'); -const key = fs.readFileSync(join(common.fixturesDir, 'agent.key')).toString(); -const cert = fs.readFileSync(join(common.fixturesDir, 'agent.crt')).toString(); +const key = fixtures.readSync('agent.key').toString(); +const cert = fixtures.readSync('agent.crt').toString(); function log(a) { console.error(`***server*** ${a}`); |