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

test: improve code in test-https-strict

Browse Source 
* use let and const instead of var
* use assert.strictEqual instead of assert.equal
* remove unused var

PR-URL: https://github.com/nodejs/node/pull/10648
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
This commit is contained in:
Adrian Estrada 2017-01-06 10:09:54 -05:00 committed by James M Snell
parent 5d31448844
commit fd115862f4
1 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
test/parallel/test-https-strict.js
View File

@ -23,60 +23,60 @@ function read(fname) {
} }
// key1 is signed by ca1. // key1 is signed by ca1.
var key1 = read('agent1-key.pem'); const key1 = read('agent1-key.pem');
var cert1 = read('agent1-cert.pem'); const cert1 = read('agent1-cert.pem');
// key2 has a self signed cert // key2 has a self signed cert
var key2 = read('agent2-key.pem'); const key2 = read('agent2-key.pem');
var cert2 = read('agent2-cert.pem'); const cert2 = read('agent2-cert.pem');
// key3 is signed by ca2. // key3 is signed by ca2.
var key3 = read('agent3-key.pem'); const key3 = read('agent3-key.pem');
var cert3 = read('agent3-cert.pem'); const cert3 = read('agent3-cert.pem');
var ca1 = read('ca1-cert.pem'); const ca1 = read('ca1-cert.pem');
var ca2 = read('ca2-cert.pem'); const ca2 = read('ca2-cert.pem');
// different agents to use different CA lists. // different agents to use different CA lists.
// this api is beyond bad. // this api is beyond bad.
var agent0 = new https.Agent(); const agent0 = new https.Agent();
var agent1 = new https.Agent({ ca: [ca1] }); const agent1 = new https.Agent({ ca: [ca1] });
var agent2 = new https.Agent({ ca: [ca2] }); const agent2 = new https.Agent({ ca: [ca2] });
var agent3 = new https.Agent({ ca: [ca1, ca2] }); const agent3 = new https.Agent({ ca: [ca1, ca2] });
var options1 = { const options1 = {
key: key1, key: key1,
cert: cert1 cert: cert1
}; };
var options2 = { const options2 = {
key: key2, key: key2,
cert: cert2 cert: cert2
}; };
var options3 = { const options3 = {
key: key3, key: key3,
cert: cert3 cert: cert3
}; };
var server1 = server(options1); const server1 = server(options1);
var server2 = server(options2); const server2 = server(options2);
var server3 = server(options3); const server3 = server(options3);
var listenWait = 0; let listenWait = 0;
server1.listen(0, listening()); server1.listen(0, listening());
server2.listen(0, listening()); server2.listen(0, listening());
server3.listen(0, listening()); server3.listen(0, listening());
var responseErrors = {}; const responseErrors = {};
var expectResponseCount = 0; let expectResponseCount = 0;
var responseCount = 0; let responseCount = 0;
var pending = 0; let pending = 0;
function server(options, port) { function server(options) {
var s = https.createServer(options, handler); const s = https.createServer(options, handler);
s.requests = []; s.requests = [];
s.expectCount = 0; s.expectCount = 0;
return s; return s;
@ -91,7 +91,7 @@ function handler(req, res) {
function listening() { function listening() {
listenWait++; listenWait++;
return function() { return () => {
listenWait--; listenWait--;
if (listenWait === 0) { if (listenWait === 0) {
allListening(); allListening();
@ -101,7 +101,7 @@ function listening() {
function makeReq(path, port, error, host, ca) { function makeReq(path, port, error, host, ca) {
pending++; pending++;
var options = { const options = {
port: port, port: port,
path: path, path: path,
ca: ca ca: ca
@ -125,9 +125,9 @@ function makeReq(path, port, error, host, ca) {
if (host) { if (host) {
options.headers = { host: host }; options.headers = { host: host };
} }
var req = https.get(options); const req = https.get(options);
expectResponseCount++; expectResponseCount++;
var server = port === server1.address().port ? server1 : const server = port === server1.address().port ? server1 :
port === server2.address().port ? server2 : port === server2.address().port ? server2 :
port === server3.address().port ? server3 : port === server3.address().port ? server3 :
null; null;
@ -135,9 +135,9 @@ function makeReq(path, port, error, host, ca) {
if (!server) throw new Error('invalid port: ' + port); if (!server) throw new Error('invalid port: ' + port);
server.expectCount++; server.expectCount++;
req.on('response', function(res) { req.on('response', (res) => {
responseCount++; responseCount++;
assert.equal(res.connection.authorizationError, error); assert.strictEqual(res.connection.authorizationError, error);
responseErrors[path] = res.connection.authorizationError; responseErrors[path] = res.connection.authorizationError;
pending--; pending--;
if (pending === 0) { if (pending === 0) {
@ -195,10 +195,9 @@ function allListening() {
} }
process.on('exit', function() { process.on('exit', () => {
console.error(responseErrors); assert.strictEqual(server1.requests.length, server1.expectCount);
assert.equal(server1.requests.length, server1.expectCount); assert.strictEqual(server2.requests.length, server2.expectCount);
assert.equal(server2.requests.length, server2.expectCount); assert.strictEqual(server3.requests.length, server3.expectCount);
assert.equal(server3.requests.length, server3.expectCount); assert.strictEqual(responseCount, expectResponseCount);
assert.equal(responseCount, expectResponseCount);
}); });