test: cleanup test-tls-connect-given-socket.js
Changed vars to consts and lets, assert.equals to assert.strictEquals and added common.mustCall around callbacks. Switched to arrow functions. PR-URL: https://github.com/nodejs/node/pull/8616 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ilkka Myller <ilkka.myller@nodefield.com>
This commit is contained in:
parent
1c81dd8d83
commit
80620d8665
@ -1,45 +1,45 @@
|
|||||||
'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 net = require('net');
|
const net = require('net');
|
||||||
var fs = require('fs');
|
const fs = require('fs');
|
||||||
var path = require('path');
|
const path = require('path');
|
||||||
|
|
||||||
var serverConnected = 0;
|
let serverConnected = 0;
|
||||||
var clientConnected = 0;
|
let clientConnected = 0;
|
||||||
|
|
||||||
var options = {
|
const options = {
|
||||||
key: fs.readFileSync(path.join(common.fixturesDir, 'test_key.pem')),
|
key: fs.readFileSync(path.join(common.fixturesDir, 'test_key.pem')),
|
||||||
cert: fs.readFileSync(path.join(common.fixturesDir, 'test_cert.pem'))
|
cert: fs.readFileSync(path.join(common.fixturesDir, 'test_cert.pem'))
|
||||||
};
|
};
|
||||||
|
|
||||||
var server = tls.createServer(options, function(socket) {
|
const server = tls.createServer(options, (socket) => {
|
||||||
serverConnected++;
|
serverConnected++;
|
||||||
socket.end('Hello');
|
socket.end('Hello');
|
||||||
}).listen(0, function() {
|
}).listen(0, () => {
|
||||||
var waiting = 2;
|
let waiting = 2;
|
||||||
function establish(socket) {
|
function establish(socket) {
|
||||||
var client = tls.connect({
|
const client = tls.connect({
|
||||||
rejectUnauthorized: false,
|
rejectUnauthorized: false,
|
||||||
socket: socket
|
socket: socket
|
||||||
}, function() {
|
}, () => {
|
||||||
clientConnected++;
|
clientConnected++;
|
||||||
var data = '';
|
let data = '';
|
||||||
client.on('data', function(chunk) {
|
client.on('data', common.mustCall((chunk) => {
|
||||||
data += chunk.toString();
|
data += chunk.toString();
|
||||||
});
|
}));
|
||||||
client.on('end', function() {
|
client.on('end', common.mustCall(() => {
|
||||||
assert.equal(data, 'Hello');
|
assert.strictEqual(data, 'Hello');
|
||||||
if (--waiting === 0)
|
if (--waiting === 0)
|
||||||
server.close();
|
server.close();
|
||||||
});
|
}));
|
||||||
});
|
});
|
||||||
assert(client.readable);
|
assert(client.readable);
|
||||||
assert(client.writable);
|
assert(client.writable);
|
||||||
@ -47,32 +47,32 @@ var server = tls.createServer(options, function(socket) {
|
|||||||
return client;
|
return client;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const { port } = server.address();
|
||||||
|
|
||||||
// Immediate death socket
|
// Immediate death socket
|
||||||
var immediateDeath = net.connect(this.address().port);
|
const immediateDeath = net.connect(port);
|
||||||
establish(immediateDeath).destroy();
|
establish(immediateDeath).destroy();
|
||||||
|
|
||||||
// Outliving
|
// Outliving
|
||||||
var outlivingTCP = net.connect(this.address().port);
|
const outlivingTCP = net.connect(port, common.mustCall(() => {
|
||||||
outlivingTCP.on('connect', function() {
|
|
||||||
outlivingTLS.destroy();
|
outlivingTLS.destroy();
|
||||||
next();
|
next();
|
||||||
});
|
}));
|
||||||
var outlivingTLS = establish(outlivingTCP);
|
const outlivingTLS = establish(outlivingTCP);
|
||||||
|
|
||||||
function next() {
|
function next() {
|
||||||
// Already connected socket
|
// Already connected socket
|
||||||
var connected = net.connect(server.address().port, function() {
|
const connected = net.connect(port, common.mustCall(() => {
|
||||||
establish(connected);
|
establish(connected);
|
||||||
});
|
}));
|
||||||
|
|
||||||
// Connecting socket
|
// Connecting socket
|
||||||
var connecting = net.connect(server.address().port);
|
const connecting = net.connect(port);
|
||||||
establish(connecting);
|
establish(connecting);
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
process.on('exit', function() {
|
process.on('exit', () => {
|
||||||
assert.equal(serverConnected, 2);
|
assert.strictEqual(serverConnected, 2);
|
||||||
assert.equal(clientConnected, 2);
|
assert.strictEqual(clientConnected, 2);
|
||||||
});
|
});
|
||||||
|
Loading…
x
Reference in New Issue
Block a user