summaryrefslogtreecommitdiff
path: root/test/parallel/test-tls-over-http-tunnel.js
diff options
context:
space:
mode:
authorJames M Snell <jasnell@gmail.com>2017-07-17 15:33:46 -0700
committerJames M Snell <jasnell@gmail.com>2017-08-07 18:00:57 -0700
commit7535a94c8a54bb6346c8e60dbae1c32d6f508212 (patch)
treee455c85470c3256bb064516a8fa8e2c4c059532b /test/parallel/test-tls-over-http-tunnel.js
parent7192e913f703c96eddff697c4ba0daef87930776 (diff)
downloadandroid-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-over-http-tunnel.js')
-rw-r--r--test/parallel/test-tls-over-http-tunnel.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/parallel/test-tls-over-http-tunnel.js b/test/parallel/test-tls-over-http-tunnel.js
index 5ff05b8504..d316a517af 100644
--- a/test/parallel/test-tls-over-http-tunnel.js
+++ b/test/parallel/test-tls-over-http-tunnel.js
@@ -26,14 +26,14 @@ if (!common.hasCrypto)
const assert = require('assert');
const https = require('https');
-const fs = require('fs');
const net = require('net');
const http = require('http');
+const fixtures = require('../common/fixtures');
let gotRequest = false;
-const key = fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`);
-const cert = fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`);
+const key = fixtures.readKey('agent1-key.pem');
+const cert = fixtures.readKey('agent1-cert.pem');
const options = {
key: key,