1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: update tls test to use const/let and common.mustCall

Browse Source 
* Replace variable defs using var with more up to date const/let.
* Updated tests to use strict equality to ensure type and value
  comparision
* wrap callback functions in common.mustCall to ensure single execution

PR-URL: https://github.com/nodejs/node/pull/9968
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
rgoodwin 2016-12-01 10:41:34 -06:00 committed by James M Snell
parent f3d613ed07
commit c142e27f66
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
test/parallel/test-tls-client-reject.js
View File

@ -1,64 +1,64 @@
'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 path = require('path'); const path = require('path');
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, common.mustCall(function(socket) { const server = tls.createServer(options, common.mustCall(function(socket) {
socket.on('data', function(data) { socket.on('data', function(data) {
console.error(data.toString()); console.error(data.toString());
assert.equal(data, 'ok'); assert.strictEqual(data.toString(), 'ok');
}); });
}, 3)).listen(0, function() { }, 3)).listen(0, function() {
unauthorized(); unauthorized();
}); });
function unauthorized() { function unauthorized() {
var socket = tls.connect({ const socket = tls.connect({
port: server.address().port, port: server.address().port,
servername: 'localhost', servername: 'localhost',
rejectUnauthorized: false rejectUnauthorized: false
}, function() { }, common.mustCall(function() {
assert(!socket.authorized); assert(!socket.authorized);
socket.end(); socket.end();
rejectUnauthorized(); rejectUnauthorized();
}); }));
socket.on('error', common.fail); socket.on('error', common.fail);
socket.write('ok'); socket.write('ok');
} }
function rejectUnauthorized() { function rejectUnauthorized() {
var socket = tls.connect(server.address().port, { const socket = tls.connect(server.address().port, {
servername: 'localhost' servername: 'localhost'
}, common.fail); }, common.fail);
socket.on('error', function(err) { socket.on('error', common.mustCall(function(err) {
console.error(err); console.error(err);
authorized(); authorized();
}); }));
socket.write('ng'); socket.write('ng');
} }
function authorized() { function authorized() {
var socket = tls.connect(server.address().port, { const socket = tls.connect(server.address().port, {
ca: [fs.readFileSync(path.join(common.fixturesDir, 'test_cert.pem'))], ca: [fs.readFileSync(path.join(common.fixturesDir, 'test_cert.pem'))],
servername: 'localhost' servername: 'localhost'
}, function() { }, common.mustCall(function() {
assert(socket.authorized); assert(socket.authorized);
socket.end(); socket.end();
server.close(); server.close();
}); }));
socket.on('error', common.fail); socket.on('error', common.fail);
socket.write('ok'); socket.write('ok');
} }