1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: refactor test-tls-two-cas-one-string

Browse Source 
* order require() statements per test writing guide
* add keydir variable to make readFileSync() calls more readable
* make `next` argument to test() optional
* use common.mustCall() to guarantee second test runs

PR-URL: https://github.com/nodejs/node/pull/13896
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
This commit is contained in:
Rich Trott 2017-06-23 22:55:33 -07:00
parent 04faf0c4eb
commit 62947916b6
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/parallel/test-tls-two-cas-one-string.js
View File

@ -1,22 +1,20 @@
'use strict'; 'use strict';
const common = require('../common'); const common = require('../common');
if (!common.hasCrypto) { if (!common.hasCrypto) {
common.skip('missing crypto'); common.skip('missing crypto');
return; return;
} }
const tls = require('tls');
const fs = require('fs'); const fs = require('fs');
const tls = require('tls');
const ca1 = const keydir = `${common.fixturesDir}/keys`;
fs.readFileSync(`${common.fixturesDir}/keys/ca1-cert.pem`, 'utf8');
const ca2 = const ca1 = fs.readFileSync(`${keydir}/ca1-cert.pem`, 'utf8');
fs.readFileSync(`${common.fixturesDir}/keys/ca2-cert.pem`, 'utf8'); const ca2 = fs.readFileSync(`${keydir}/ca2-cert.pem`, 'utf8');
const cert = const cert = fs.readFileSync(`${keydir}/agent3-cert.pem`, 'utf8');
fs.readFileSync(`${common.fixturesDir}/keys/agent3-cert.pem`, 'utf8'); const key = fs.readFileSync(`${keydir}/agent3-key.pem`, 'utf8');
const key =
fs.readFileSync(`${common.fixturesDir}/keys/agent3-key.pem`, 'utf8');
function test(ca, next) { function test(ca, next) {
const server = tls.createServer({ ca, cert, key }, function(conn) { const server = tls.createServer({ ca, cert, key }, function(conn) {
@ -31,9 +29,11 @@ function test(ca, next) {
tls.connect({ servername: 'agent3', host, port: this.address().port, ca }); tls.connect({ servername: 'agent3', host, port: this.address().port, ca });
}); });
server.once('close', next); if (next) {
server.once('close', next);
}
} }
const array = [ca1, ca2]; const array = [ca1, ca2];
const string = `${ca1}\n${ca2}`; const string = `${ca1}\n${ca2}`;
test(array, () => test(string, common.noop)); test(array, common.mustCall(() => test(string)));