Nodejs/node
1
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2024-11-21 10:59:27 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

test: fix nits in test/fixtures/tls-connect.js

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/28880
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
This commit is contained in:
Luigi Pinca 2019-07-28 15:25:30 +02:00 committed by Rich Trott
parent 985c5f5b7e
commit 834a413eed
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/fixtures/tls-connect.js vendored
View File

@ -18,7 +18,7 @@ exports.debug = util.debuglog('test');
exports.tls = tls;
// Pre-load keys from common fixtures for ease of use by tests.
const keys = exports.keys = {
exports.keys = {
agent1: load('agent1', 'ca1'),
agent2: load('agent2', 'agent2'),
agent3: load('agent3', 'ca2'),
@ -31,9 +31,9 @@ const keys = exports.keys = {
ec: load('ec', 'ec'),
};
// root is the self-signed root of the trust chain, not an intermediate ca.
// `root` is the self-signed root of the trust chain, not an intermediate ca.
function load(cert, root) {
root = root || cert; // Assume self-signed if no issuer
root = root || cert; // Assume self-signed if no issuer.
const id = {
key: fixtures.readKey(cert + '-key.pem', 'binary'),
cert: fixtures.readKey(cert + '-cert.pem', 'binary'),
@ -53,7 +53,7 @@ exports.connect = function connect(options, callback) {
tls.createServer(options.server, function(conn) {
server.conn = conn;
conn.pipe(conn);
maybeCallback()
maybeCallback();
}).listen(0, function() {
server.server = this;
@ -92,7 +92,7 @@ exports.connect = function connect(options, callback) {
function maybeCallback() {
if (!callback)
return;
if (server.conn && (client.conn || client.err)) {
if (server.conn && client.conn) {
const err = pair.client.err || pair.server.err;
callback(err, pair, cleanup);
callback = null;
@ -105,4 +105,4 @@ exports.connect = function connect(options, callback) {
if (client.conn)
client.conn.end();
}
}
};