test: refactor test-https-agent-session-reuse
Use const and let instead of var and assert.strictEqual() instead of assert.equal() PR-URL: https://github.com/nodejs/node/pull/10105 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
This commit is contained in:
parent
89603835b3
commit
83d9cd80bf
@ -1,39 +1,39 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
var common = require('../common');
|
const common = require('../common');
|
||||||
var assert = require('assert');
|
const assert = require('assert');
|
||||||
|
|
||||||
if (!common.hasCrypto) {
|
if (!common.hasCrypto) {
|
||||||
common.skip('missing crypto');
|
common.skip('missing crypto');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var https = require('https');
|
const https = require('https');
|
||||||
var crypto = require('crypto');
|
const crypto = require('crypto');
|
||||||
|
|
||||||
var fs = require('fs');
|
const fs = require('fs');
|
||||||
|
|
||||||
var options = {
|
const options = {
|
||||||
key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
|
key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
|
||||||
cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')
|
cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')
|
||||||
};
|
};
|
||||||
|
|
||||||
var ca = fs.readFileSync(common.fixturesDir + '/keys/ca1-cert.pem');
|
const ca = fs.readFileSync(common.fixturesDir + '/keys/ca1-cert.pem');
|
||||||
|
|
||||||
var clientSessions = {};
|
const clientSessions = {};
|
||||||
var serverRequests = 0;
|
let serverRequests = 0;
|
||||||
|
|
||||||
var agent = new https.Agent({
|
const agent = new https.Agent({
|
||||||
maxCachedSessions: 1
|
maxCachedSessions: 1
|
||||||
});
|
});
|
||||||
|
|
||||||
var server = https.createServer(options, function(req, res) {
|
const server = https.createServer(options, function(req, res) {
|
||||||
if (req.url === '/drop-key')
|
if (req.url === '/drop-key')
|
||||||
server.setTicketKeys(crypto.randomBytes(48));
|
server.setTicketKeys(crypto.randomBytes(48));
|
||||||
|
|
||||||
serverRequests++;
|
serverRequests++;
|
||||||
res.end('ok');
|
res.end('ok');
|
||||||
}).listen(0, function() {
|
}).listen(0, function() {
|
||||||
var queue = [
|
const queue = [
|
||||||
{
|
{
|
||||||
name: 'first',
|
name: 'first',
|
||||||
|
|
||||||
@ -97,7 +97,7 @@ var server = https.createServer(options, function(req, res) {
|
|||||||
];
|
];
|
||||||
|
|
||||||
function request() {
|
function request() {
|
||||||
var options = queue.shift();
|
const options = queue.shift();
|
||||||
options.agent = agent;
|
options.agent = agent;
|
||||||
https.request(options, function(res) {
|
https.request(options, function(res) {
|
||||||
clientSessions[options.name] = res.socket.getSession();
|
clientSessions[options.name] = res.socket.getSession();
|
||||||
@ -114,9 +114,9 @@ var server = https.createServer(options, function(req, res) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
process.on('exit', function() {
|
process.on('exit', function() {
|
||||||
assert.equal(serverRequests, 6);
|
assert.strictEqual(serverRequests, 6);
|
||||||
assert.equal(clientSessions['first'].toString('hex'),
|
assert.strictEqual(clientSessions['first'].toString('hex'),
|
||||||
clientSessions['first-reuse'].toString('hex'));
|
clientSessions['first-reuse'].toString('hex'));
|
||||||
assert.notEqual(clientSessions['first'].toString('hex'),
|
assert.notEqual(clientSessions['first'].toString('hex'),
|
||||||
clientSessions['cipher-change'].toString('hex'));
|
clientSessions['cipher-change'].toString('hex'));
|
||||||
assert.notEqual(clientSessions['first'].toString('hex'),
|
assert.notEqual(clientSessions['first'].toString('hex'),
|
||||||
@ -125,6 +125,6 @@ process.on('exit', function() {
|
|||||||
clientSessions['before-drop'].toString('hex'));
|
clientSessions['before-drop'].toString('hex'));
|
||||||
assert.notEqual(clientSessions['before-drop'].toString('hex'),
|
assert.notEqual(clientSessions['before-drop'].toString('hex'),
|
||||||
clientSessions['after-drop'].toString('hex'));
|
clientSessions['after-drop'].toString('hex'));
|
||||||
assert.equal(clientSessions['after-drop'].toString('hex'),
|
assert.strictEqual(clientSessions['after-drop'].toString('hex'),
|
||||||
clientSessions['after-drop-reuse'].toString('hex'));
|
clientSessions['after-drop-reuse'].toString('hex'));
|
||||||
});
|
});
|
||||||
|
Loading…
x
Reference in New Issue
Block a user