summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorTobias Nießen <tniessen@tnie.de>2018-01-11 17:32:05 +0100
committerTobias Nießen <tniessen@tnie.de>2018-01-17 12:35:00 +0100
commiteb68a06a3e66cff0092fc26e79f06a25f8f1ac43 (patch)
tree42a750b558319b13d1ac59fc5a22223d0246c7ef /test
parent4e2e7d11e16d185a088aec77d1adc7bb4b606806 (diff)
downloadandroid-node-v8-eb68a06a3e66cff0092fc26e79f06a25f8f1ac43.tar.gz
android-node-v8-eb68a06a3e66cff0092fc26e79f06a25f8f1ac43.tar.bz2
android-node-v8-eb68a06a3e66cff0092fc26e79f06a25f8f1ac43.zip
test: simplify loadDHParam in TLS test
PR-URL: https://github.com/nodejs/node/pull/18103 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Diffstat (limited to 'test')
-rw-r--r--test/parallel/test-tls-client-getephemeralkeyinfo.js5
-rw-r--r--test/parallel/test-tls-client-mindhsize.js5
2 files changed, 2 insertions, 8 deletions
diff --git a/test/parallel/test-tls-client-getephemeralkeyinfo.js b/test/parallel/test-tls-client-getephemeralkeyinfo.js
index d62e1ac0e1..4c1f791a7e 100644
--- a/test/parallel/test-tls-client-getephemeralkeyinfo.js
+++ b/test/parallel/test-tls-client-getephemeralkeyinfo.js
@@ -6,7 +6,6 @@ const fixtures = require('../common/fixtures');
const assert = require('assert');
const tls = require('tls');
-const fs = require('fs');
const key = fixtures.readKey('agent2-key.pem');
const cert = fixtures.readKey('agent2-cert.pem');
@@ -15,9 +14,7 @@ let ntests = 0;
let nsuccess = 0;
function loadDHParam(n) {
- let path = fixtures.fixturesDir;
- if (n !== 'error') path += '/keys';
- return fs.readFileSync(`${path}/dh${n}.pem`);
+ return fixtures.readKey(`dh${n}.pem`);
}
const cipherlist = {
diff --git a/test/parallel/test-tls-client-mindhsize.js b/test/parallel/test-tls-client-mindhsize.js
index cc613ae6b7..3017d30e6c 100644
--- a/test/parallel/test-tls-client-mindhsize.js
+++ b/test/parallel/test-tls-client-mindhsize.js
@@ -14,10 +14,7 @@ let nsuccess = 0;
let nerror = 0;
function loadDHParam(n) {
- const params = [`dh${n}.pem`];
- if (n !== 'error')
- params.unshift('keys');
- return fixtures.readSync(params);
+ return fixtures.readKey(`dh${n}.pem`);
}
function test(size, err, next) {