FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

test: refactor tls-ticket-cluster · nodejs/node@a2023a9 · GitHub

/ node Public

Commit a2023a9

Browse files
shri3k
authored and
MylesBorins
committed
test: refactor tls-ticket-cluster
- changes var to const/let - changes assert.equal to assert.strictEqual - changes `notEqual` to `notStrictEqual` PR-URL: #10023 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent a64f406 commit a2023a9

2 files changed

Lines changed: 49 additions & 49 deletions

File tree

‎test/parallel/test-tls-ticket-cluster.js‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
'use strict';
2-
var common = require('../common');
3-
var assert = require('assert');
2+
const common = require('../common');
3+
const assert = require('assert');
44

55
if (!common.hasCrypto) {
66
common.skip('missing crypto');
77
return;
88
}
9-
var tls = require('tls');
9+
const tls = require('tls');
1010

11-
var cluster = require('cluster');
12-
var fs = require('fs');
13-
var join = require('path').join;
11+
const cluster = require('cluster');
12+
const fs = require('fs');
13+
const join = require('path').join;
1414

15-
var workerCount = 4;
16-
var expectedReqCount = 16;
15+
const workerCount = 4;
16+
const expectedReqCount = 16;
1717

1818
if (cluster.isMaster) {
19-
var reusedCount = 0;
20-
var reqCount = 0;
21-
var lastSession = null;
22-
var shootOnce = false;
19+
let reusedCount = 0;
20+
let reqCount = 0;
21+
let lastSession = null;
22+
let shootOnce = false;
2323

2424
function shoot() {
2525
console.error('[master] connecting');
26-
var c = tls.connect(common.PORT, {
26+
const c = tls.connect(common.PORT, {
2727
session: lastSession,
2828
rejectUnauthorized: false
2929
}, function() {
@@ -41,7 +41,7 @@ if (cluster.isMaster) {
4141
}
4242

4343
function fork() {
44-
var worker = cluster.fork();
44+
const worker = cluster.fork();
4545
worker.on('message', function(msg) {
4646
console.error('[master] got %j', msg);
4747
if (msg === 'reused') {
@@ -56,27 +56,27 @@ if (cluster.isMaster) {
5656
console.error('[master] worker died');
5757
});
5858
}
59-
for (var i = 0; i < workerCount; i++) {
59+
for (let i = 0; i < workerCount; i++) {
6060
fork();
6161
}
6262

6363
process.on('exit', function() {
64-
assert.equal(reqCount, expectedReqCount);
65-
assert.equal(reusedCount + 1, reqCount);
64+
assert.strictEqual(reqCount, expectedReqCount);
65+
assert.strictEqual(reusedCount + 1, reqCount);
6666
});
6767
return;
6868
}
6969

70-
var keyFile = join(common.fixturesDir, 'agent.key');
71-
var certFile = join(common.fixturesDir, 'agent.crt');
72-
var key = fs.readFileSync(keyFile);
73-
var cert = fs.readFileSync(certFile);
74-
var options = {
70+
const keyFile = join(common.fixturesDir, 'agent.key');
71+
const certFile = join(common.fixturesDir, 'agent.crt');
72+
const key = fs.readFileSync(keyFile);
73+
const cert = fs.readFileSync(certFile);
74+
const options = {
7575
key: key,
7676
cert: cert
7777
};
7878

79-
var server = tls.createServer(options, function(c) {
79+
const server = tls.createServer(options, function(c) {
8080
if (c.isSessionReused()) {
8181
process.send('reused');
8282
} else {

‎test/parallel/test-tls-ticket.js‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
'use strict';
2-
var common = require('../common');
3-
var assert = require('assert');
2+
const common = require('../common');
3+
const assert = require('assert');
44

55
if (!common.hasCrypto) {
66
common.skip('missing crypto');
77
return;
88
}
9-
var tls = require('tls');
9+
const tls = require('tls');
1010

11-
var fs = require('fs');
12-
var net = require('net');
13-
var crypto = require('crypto');
11+
const fs = require('fs');
12+
const net = require('net');
13+
const crypto = require('crypto');
1414

15-
var keys = crypto.randomBytes(48);
16-
var serverLog = [];
17-
var ticketLog = [];
15+
const keys = crypto.randomBytes(48);
16+
const serverLog = [];
17+
const ticketLog = [];
1818

19-
var serverCount = 0;
19+
let serverCount = 0;
2020
function createServer() {
21-
var id = serverCount++;
21+
const id = serverCount++;
2222

23-
var counter = 0;
24-
var previousKey = null;
23+
let counter = 0;
24+
let previousKey = null;
2525

26-
var server = tls.createServer({
26+
const server = tls.createServer({
2727
key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
2828
cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem'),
2929
ticketKeys: keys
@@ -49,13 +49,13 @@ function createServer() {
4949
return server;
5050
}
5151

52-
var naturalServers = [ createServer(), createServer(), createServer() ];
52+
const naturalServers = [ createServer(), createServer(), createServer() ];
5353

5454
// 3x servers
55-
var servers = naturalServers.concat(naturalServers).concat(naturalServers);
55+
const servers = naturalServers.concat(naturalServers).concat(naturalServers);
5656

5757
// Create one TCP server and balance sockets to multiple TLS server instances
58-
var shared = net.createServer(function(c) {
58+
const shared = net.createServer(function(c) {
5959
servers.shift().emit('connection', c);
6060
}).listen(0, function() {
6161
start(function() {
@@ -64,11 +64,11 @@ var shared = net.createServer(function(c) {
6464
});
6565

6666
function start(callback) {
67-
var sess = null;
68-
var left = servers.length;
67+
let sess = null;
68+
let left = servers.length;
6969

7070
function connect() {
71-
var s = tls.connect(shared.address().port, {
71+
const s = tls.connect(shared.address().port, {
7272
session: sess,
7373
rejectUnauthorized: false
7474
}, function() {
@@ -87,15 +87,15 @@ function start(callback) {
8787
}
8888

8989
process.on('exit', function() {
90-
assert.equal(ticketLog.length, serverLog.length);
91-
for (var i = 0; i < naturalServers.length - 1; i++) {
92-
assert.notEqual(serverLog[i], serverLog[i + 1]);
93-
assert.equal(ticketLog[i], ticketLog[i + 1]);
90+
assert.strictEqual(ticketLog.length, serverLog.length);
91+
for (let i = 0; i < naturalServers.length - 1; i++) {
92+
assert.notStrictEqual(serverLog[i], serverLog[i + 1]);
93+
assert.strictEqual(ticketLog[i], ticketLog[i + 1]);
9494

9595
// 2nd connection should have different ticket
96-
assert.notEqual(ticketLog[i], ticketLog[i + naturalServers.length]);
96+
assert.notStrictEqual(ticketLog[i], ticketLog[i + naturalServers.length]);
9797

9898
// 3rd connection should have the same ticket
99-
assert.equal(ticketLog[i], ticketLog[i + naturalServers.length * 2]);
99+
assert.strictEqual(ticketLog[i], ticketLog[i + naturalServers.length * 2]);
100100
}
101101
});

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL