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

test: use const/let and common.mustCall

Browse Source 
remove process.on('exit') because all callbacks are
wrapped by common.mustCall.

PR-URL: https://github.com/nodejs/node/pull/9959
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
This commit is contained in:
Outsider 2016-12-01 10:31:42 -06:00 committed by Roman Reiss
parent 4a08ac695c
commit 4913acd364
No known key found for this signature in database
GPG Key ID: 2E62B41C93869443
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
test/parallel/test-tls-cnnic-whitelist.js
View File

@ -1,16 +1,15 @@
'use strict';
var common = require('../common');
var assert = require('assert');
const common = require('../common');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}
var tls = require('tls');
var fs = require('fs');
var path = require('path');
var finished = 0;
const assert = require('assert');
const tls = require('tls');
const fs = require('fs');
const path = require('path');
function filenamePEM(n) {
return path.join(common.fixturesDir, 'keys', n + '.pem');
@ -20,7 +19,7 @@ function loadPEM(n) {
return fs.readFileSync(filenamePEM(n));
}
var testCases = [
const testCases = [
{ // Test 0: for the check of a cert not existed in the whitelist.
// agent7-cert.pem is issued by the fake CNNIC root CA so that its
// hash is not listed in the whitelist.
@ -58,27 +57,22 @@ var testCases = [
];
function runTest(tindex) {
var tcase = testCases[tindex];
const tcase = testCases[tindex];
if (!tcase) return;
var server = tls.createServer(tcase.serverOpts, function(s) {
const server = tls.createServer(tcase.serverOpts, (s) => {
s.resume();
}).listen(0, function() {
}).listen(0, common.mustCall(function() {
tcase.clientOpts = this.address().port;
var client = tls.connect(tcase.clientOpts);
client.on('error', function(e) {
const client = tls.connect(tcase.clientOpts);
client.on('error', common.mustCall((e) => {
assert.strictEqual(e.code, tcase.errorCode);
server.close(function() {
finished++;
server.close(common.mustCall(() => {
runTest(tindex + 1);
});
});
});
}));
}));
}));
}
runTest(0);
process.on('exit', function() {
assert.equal(finished, testCases.length);
});