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-sni-server-client.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-sni-server-client.js')
-rw-r--r-- | test/parallel/test-tls-sni-server-client.js | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/test/parallel/test-tls-sni-server-client.js b/test/parallel/test-tls-sni-server-client.js index 14ad9e7c83..ef1bc09cc0 100644 --- a/test/parallel/test-tls-sni-server-client.js +++ b/test/parallel/test-tls-sni-server-client.js @@ -28,16 +28,12 @@ if (!process.features.tls_sni) common.skip('node compiled without OpenSSL or with old OpenSSL version.'); const assert = require('assert'); -const fs = require('fs'); -const path = require('path'); const tls = require('tls'); +const fixtures = require('../common/fixtures'); -function filenamePEM(n) { - return path.join(common.fixturesDir, 'keys', `${n}.pem`); -} function loadPEM(n) { - return fs.readFileSync(filenamePEM(n)); + return fixtures.readKey(`${n}.pem`); } const serverOptions = { |