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

test: refactor test-tls-ecdh

Browse Source 
clear out const/let
change assert.notEqual to assert
move assert after common.hasCrypto check

PR-URL: https://github.com/nodejs/node/pull/9878
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
This commit is contained in:
Adriana Rios 2016-12-01 09:54:26 -06:00 committed by Michaël Zasso
parent 8892433792
commit efa84563f2
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/parallel/test-tls-ecdh.js
View File

@ -1,31 +1,31 @@
'use strict'; 'use strict';
var common = require('../common'); const common = require('../common');
var assert = require('assert');
if (!common.hasCrypto) { if (!common.hasCrypto) {
common.skip('missing crypto'); common.skip('missing crypto');
return; return;
} }
var tls = require('tls'); const assert = require('assert');
const tls = require('tls');
var exec = require('child_process').exec; const exec = require('child_process').exec;
var fs = require('fs'); const fs = require('fs');
var options = { const options = {
key: fs.readFileSync(common.fixturesDir + '/keys/agent2-key.pem'), key: fs.readFileSync(common.fixturesDir + '/keys/agent2-key.pem'),
cert: fs.readFileSync(common.fixturesDir + '/keys/agent2-cert.pem'), cert: fs.readFileSync(common.fixturesDir + '/keys/agent2-cert.pem'),
ciphers: '-ALL:ECDHE-RSA-AES128-SHA256', ciphers: '-ALL:ECDHE-RSA-AES128-SHA256',
ecdhCurve: 'prime256v1' ecdhCurve: 'prime256v1'
}; };
var reply = 'I AM THE WALRUS'; // something recognizable const reply = 'I AM THE WALRUS'; // something recognizable
var server = tls.createServer(options, common.mustCall(function(conn) { const server = tls.createServer(options, common.mustCall(function(conn) {
conn.end(reply); conn.end(reply);
})); }));
server.listen(0, '127.0.0.1', common.mustCall(function() { server.listen(0, '127.0.0.1', common.mustCall(function() {
var cmd = '"' + common.opensslCli + '" s_client -cipher ' + options.ciphers + let cmd = '"' + common.opensslCli + '" s_client -cipher ' + options.ciphers +
` -connect 127.0.0.1:${this.address().port}`; ` -connect 127.0.0.1:${this.address().port}`;
// for the performance and stability issue in s_client on Windows // for the performance and stability issue in s_client on Windows
@ -34,7 +34,7 @@ server.listen(0, '127.0.0.1', common.mustCall(function() {
exec(cmd, common.mustCall(function(err, stdout, stderr) { exec(cmd, common.mustCall(function(err, stdout, stderr) {
if (err) throw err; if (err) throw err;
assert.notEqual(stdout.indexOf(reply), -1); assert(stdout.includes(reply));
server.close(); server.close();
})); }));
})); }));