Commit 780d444
test: refactor test-https-agent-session-reuse
Use const and let instead of var and assert.strictEqual() instead of
assert.equal()
PR-URL: #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>1 parent 3686687 commit 780d444
1 file changed
Lines changed: 18 additions & 18 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,39 +1,39 @@ | |||
| 1 | 1 | 'use strict'; | |
| 2 | - var common = require('../common'); | ||
| 3 | - var assert = require('assert'); | ||
| 2 | + const common = require('../common'); | ||
| 3 | + const assert = require('assert'); | ||
| 4 | 4 | ||
| 5 | 5 | if (!common.hasCrypto) { | |
| 6 | 6 | common.skip('missing crypto'); | |
| 7 | 7 | return; | |
| 8 | 8 | } | |
| 9 | 9 | ||
| 10 | - var https = require('https'); | ||
| 11 | - var crypto = require('crypto'); | ||
| 10 | + const https = require('https'); | ||
| 11 | + const crypto = require('crypto'); | ||
| 12 | 12 | ||
| 13 | - var fs = require('fs'); | ||
| 13 | + const fs = require('fs'); | ||
| 14 | 14 | ||
| 15 | - var options = { | ||
| 15 | + const options = { | ||
| 16 | 16 | key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'), | |
| 17 | 17 | cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem') | |
| 18 | 18 | }; | |
| 19 | 19 | ||
| 20 | - var ca = fs.readFileSync(common.fixturesDir + '/keys/ca1-cert.pem'); | ||
| 20 | + const ca = fs.readFileSync(common.fixturesDir + '/keys/ca1-cert.pem'); | ||
| 21 | 21 | ||
| 22 | - var clientSessions = {}; | ||
| 23 | - var serverRequests = 0; | ||
| 22 | + const clientSessions = {}; | ||
| 23 | + let serverRequests = 0; | ||
| 24 | 24 | ||
| 25 | - var agent = new https.Agent({ | ||
| 25 | + const agent = new https.Agent({ | ||
| 26 | 26 | maxCachedSessions: 1 | |
| 27 | 27 | }); | |
| 28 | 28 | ||
| 29 | - var server = https.createServer(options, function(req, res) { | ||
| 29 | + const server = https.createServer(options, function(req, res) { | ||
| 30 | 30 | if (req.url === '/drop-key') | |
| 31 | 31 | server.setTicketKeys(crypto.randomBytes(48)); | |
| 32 | 32 | ||
| 33 | 33 | serverRequests++; | |
| 34 | 34 | res.end('ok'); | |
| 35 | 35 | }).listen(0, function() { | |
| 36 | - var queue = [ | ||
| 36 | + const queue = [ | ||
| 37 | 37 | { | |
| 38 | 38 | name: 'first', | |
| 39 | 39 | ||
@@ -97,7 +97,7 @@ var server = https.createServer(options, function(req, res) { | |||
| 97 | 97 | ]; | |
| 98 | 98 | ||
| 99 | 99 | function request() { | |
| 100 | - var options = queue.shift(); | ||
| 100 | + const options = queue.shift(); | ||
| 101 | 101 | options.agent = agent; | |
| 102 | 102 | https.request(options, function(res) { | |
| 103 | 103 | clientSessions[options.name] = res.socket.getSession(); | |
@@ -114,9 +114,9 @@ var server = https.createServer(options, function(req, res) { | |||
| 114 | 114 | }); | |
| 115 | 115 | ||
| 116 | 116 | process.on('exit', function() { | |
| 117 | - assert.equal(serverRequests, 6); | ||
| 118 | - assert.equal(clientSessions['first'].toString('hex'), | ||
| 119 | - clientSessions['first-reuse'].toString('hex')); | ||
| 117 | + assert.strictEqual(serverRequests, 6); | ||
| 118 | + assert.strictEqual(clientSessions['first'].toString('hex'), | ||
| 119 | + clientSessions['first-reuse'].toString('hex')); | ||
| 120 | 120 | assert.notEqual(clientSessions['first'].toString('hex'), | |
| 121 | 121 | clientSessions['cipher-change'].toString('hex')); | |
| 122 | 122 | assert.notEqual(clientSessions['first'].toString('hex'), | |
@@ -125,6 +125,6 @@ process.on('exit', function() { | |||
| 125 | 125 | clientSessions['before-drop'].toString('hex')); | |
| 126 | 126 | assert.notEqual(clientSessions['before-drop'].toString('hex'), | |
| 127 | 127 | clientSessions['after-drop'].toString('hex')); | |
| 128 | - assert.equal(clientSessions['after-drop'].toString('hex'), | ||
| 129 | - clientSessions['after-drop-reuse'].toString('hex')); | ||
| 128 | + assert.strictEqual(clientSessions['after-drop'].toString('hex'), | ||
| 129 | + clientSessions['after-drop-reuse'].toString('hex')); | ||
| 130 | 130 | }); | |
0 commit comments