Browse Source

test: refactor tls-ticket-cluster

- changes var to const/let
- changes assert.equal to assert.strictEqual
- changes `notEqual` to `notStrictEqual`

PR-URL: https://github.com/nodejs/node/pull/10023
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
v4.x
Yojan Shrestha 8 years ago
committed by Myles Borins
parent
commit
a2023a9d97
  1. 46
      test/parallel/test-tls-ticket-cluster.js
  2. 52
      test/parallel/test-tls-ticket.js

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

@ -1,29 +1,29 @@
'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 tls = require('tls'); const tls = require('tls');
var cluster = require('cluster'); const cluster = require('cluster');
var fs = require('fs'); const fs = require('fs');
var join = require('path').join; const join = require('path').join;
var workerCount = 4; const workerCount = 4;
var expectedReqCount = 16; const expectedReqCount = 16;
if (cluster.isMaster) { if (cluster.isMaster) {
var reusedCount = 0; let reusedCount = 0;
var reqCount = 0; let reqCount = 0;
var lastSession = null; let lastSession = null;
var shootOnce = false; let shootOnce = false;
function shoot() { function shoot() {
console.error('[master] connecting'); console.error('[master] connecting');
var c = tls.connect(common.PORT, { const c = tls.connect(common.PORT, {
session: lastSession, session: lastSession,
rejectUnauthorized: false rejectUnauthorized: false
}, function() { }, function() {
@ -41,7 +41,7 @@ if (cluster.isMaster) {
} }
function fork() { function fork() {
var worker = cluster.fork(); const worker = cluster.fork();
worker.on('message', function(msg) { worker.on('message', function(msg) {
console.error('[master] got %j', msg); console.error('[master] got %j', msg);
if (msg === 'reused') { if (msg === 'reused') {
@ -56,27 +56,27 @@ if (cluster.isMaster) {
console.error('[master] worker died'); console.error('[master] worker died');
}); });
} }
for (var i = 0; i < workerCount; i++) { for (let i = 0; i < workerCount; i++) {
fork(); fork();
} }
process.on('exit', function() { process.on('exit', function() {
assert.equal(reqCount, expectedReqCount); assert.strictEqual(reqCount, expectedReqCount);
assert.equal(reusedCount + 1, reqCount); assert.strictEqual(reusedCount + 1, reqCount);
}); });
return; return;
} }
var keyFile = join(common.fixturesDir, 'agent.key'); const keyFile = join(common.fixturesDir, 'agent.key');
var certFile = join(common.fixturesDir, 'agent.crt'); const certFile = join(common.fixturesDir, 'agent.crt');
var key = fs.readFileSync(keyFile); const key = fs.readFileSync(keyFile);
var cert = fs.readFileSync(certFile); const cert = fs.readFileSync(certFile);
var options = { const options = {
key: key, key: key,
cert: cert cert: cert
}; };
var server = tls.createServer(options, function(c) { const server = tls.createServer(options, function(c) {
if (c.isSessionReused()) { if (c.isSessionReused()) {
process.send('reused'); process.send('reused');
} else { } else {

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

@ -1,29 +1,29 @@
'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 tls = require('tls'); const tls = require('tls');
var fs = require('fs'); const fs = require('fs');
var net = require('net'); const net = require('net');
var crypto = require('crypto'); const crypto = require('crypto');
var keys = crypto.randomBytes(48); const keys = crypto.randomBytes(48);
var serverLog = []; const serverLog = [];
var ticketLog = []; const ticketLog = [];
var serverCount = 0; let serverCount = 0;
function createServer() { function createServer() {
var id = serverCount++; const id = serverCount++;
var counter = 0; let counter = 0;
var previousKey = null; let previousKey = null;
var server = tls.createServer({ const server = tls.createServer({
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'),
ticketKeys: keys ticketKeys: keys
@ -49,13 +49,13 @@ function createServer() {
return server; return server;
} }
var naturalServers = [ createServer(), createServer(), createServer() ]; const naturalServers = [ createServer(), createServer(), createServer() ];
// 3x servers // 3x servers
var servers = naturalServers.concat(naturalServers).concat(naturalServers); const servers = naturalServers.concat(naturalServers).concat(naturalServers);
// Create one TCP server and balance sockets to multiple TLS server instances // Create one TCP server and balance sockets to multiple TLS server instances
var shared = net.createServer(function(c) { const shared = net.createServer(function(c) {
servers.shift().emit('connection', c); servers.shift().emit('connection', c);
}).listen(0, function() { }).listen(0, function() {
start(function() { start(function() {
@ -64,11 +64,11 @@ var shared = net.createServer(function(c) {
}); });
function start(callback) { function start(callback) {
var sess = null; let sess = null;
var left = servers.length; let left = servers.length;
function connect() { function connect() {
var s = tls.connect(shared.address().port, { const s = tls.connect(shared.address().port, {
session: sess, session: sess,
rejectUnauthorized: false rejectUnauthorized: false
}, function() { }, function() {
@ -87,15 +87,15 @@ function start(callback) {
} }
process.on('exit', function() { process.on('exit', function() {
assert.equal(ticketLog.length, serverLog.length); assert.strictEqual(ticketLog.length, serverLog.length);
for (var i = 0; i < naturalServers.length - 1; i++) { for (let i = 0; i < naturalServers.length - 1; i++) {
assert.notEqual(serverLog[i], serverLog[i + 1]); assert.notStrictEqual(serverLog[i], serverLog[i + 1]);
assert.equal(ticketLog[i], ticketLog[i + 1]); assert.strictEqual(ticketLog[i], ticketLog[i + 1]);
// 2nd connection should have different ticket // 2nd connection should have different ticket
assert.notEqual(ticketLog[i], ticketLog[i + naturalServers.length]); assert.notStrictEqual(ticketLog[i], ticketLog[i + naturalServers.length]);
// 3rd connection should have the same ticket // 3rd connection should have the same ticket
assert.equal(ticketLog[i], ticketLog[i + naturalServers.length * 2]); assert.strictEqual(ticketLog[i], ticketLog[i + naturalServers.length * 2]);
} }
}); });

Loading…
Cancel
Save