Commit eaa30e4
test: simplify loadDHParam in TLS test
PR-URL: #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>1 parent 2004efd commit eaa30e4
2 files changed
Lines changed: 2 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -6,7 +6,6 @@ const fixtures = require('../common/fixtures'); | |||
| 6 | 6 | ||
| 7 | 7 | const assert = require('assert'); | |
| 8 | 8 | const tls = require('tls'); | |
| 9 | - const fs = require('fs'); | ||
| 10 | 9 | ||
| 11 | 10 | const key = fixtures.readKey('agent2-key.pem'); | |
| 12 | 11 | const cert = fixtures.readKey('agent2-cert.pem'); | |
@@ -15,9 +14,7 @@ let ntests = 0; | |||
| 15 | 14 | let nsuccess = 0; | |
| 16 | 15 | ||
| 17 | 16 | function loadDHParam(n) { | |
| 18 | - let path = fixtures.fixturesDir; | ||
| 19 | - if (n !== 'error') path += '/keys'; | ||
| 20 | - return fs.readFileSync(`${path}/dh${n}.pem`); | ||
| 17 | + return fixtures.readKey(`dh${n}.pem`); | ||
| 21 | 18 | } | |
| 22 | 19 | ||
| 23 | 20 | const cipherlist = { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -14,10 +14,7 @@ let nsuccess = 0; | |||
| 14 | 14 | let nerror = 0; | |
| 15 | 15 | ||
| 16 | 16 | function loadDHParam(n) { | |
| 17 | - const params = [`dh${n}.pem`]; | ||
| 18 | - if (n !== 'error') | ||
| 19 | - params.unshift('keys'); | ||
| 20 | - return fixtures.readSync(params); | ||
| 17 | + return fixtures.readKey(`dh${n}.pem`); | ||
| 21 | 18 | } | |
| 22 | 19 | ||
| 23 | 20 | function test(size, err, next) { | |
0 commit comments