test: refactor test-tls-alert-handling

Trott · MylesBorins · commit 06f934ffe766 · 2017-01-24T00:00:07.000-08:00
* process.on('exit',...) checks -> common.mustCall() * remove unused function parameters * var -> const/let PR-URL: #10482 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Italo A. Casas <me@italoacasas.com>
diff --git a/test/parallel/test-tls-alert-handling.js b/test/parallel/test-tls-alert-handling.js
@@ -1,6 +1,5 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
+const common = require('../common');
 
 if (!common.opensslCli) {
 common.skip('node compiled without OpenSSL CLI.');
@@ -12,11 +11,9 @@ if (!common.hasCrypto) {
 return;
 }
 
-var tls = require('tls');
-var net = require('net');
-var fs = require('fs');
-
-var success = false;
+const tls = require('tls');
+const net = require('net');
+const fs = require('fs');
 
 function filenamePEM(n) {
 return require('path').join(common.fixturesDir, 'keys', n + '.pem');
@@ -26,17 +23,16 @@ function loadPEM(n) {
 return fs.readFileSync(filenamePEM(n));
 }
 
-var opts = {
+const opts = {
 key: loadPEM('agent2-key'),
 cert: loadPEM('agent2-cert')
 };
+const max_iter = 20;
+let iter = 0;
 
-var max_iter = 20;
-var iter = 0;
-
-var server = tls.createServer(opts, function(s) {
+const server = tls.createServer(opts, function(s) {
 s.pipe(s);
- s.on('error', function(e) {
+ s.on('error', function() {
 // ignore error
 });
 });
@@ -47,21 +43,20 @@ server.listen(0, function() {
 
 
 function sendClient() {
- var client = tls.connect(server.address().port, {
+ const client = tls.connect(server.address().port, {
 rejectUnauthorized: false
 });
- client.on('data', function(chunk) {
+ client.on('data', common.mustCall(function() {
 if (iter++ === 2) sendBADTLSRecord();
 if (iter < max_iter) {
 client.write('a');
 return;
 }
 client.end();
 server.close();
- success = true;
- });
+ }, max_iter));
 client.write('a');
- client.on('error', function(e) {
+ client.on('error', function() {
 // ignore error
 });
 client.on('close', function() {
@@ -71,21 +66,16 @@ function sendClient() {
 
 
 function sendBADTLSRecord() {
- var BAD_RECORD = Buffer.from([0xff, 0xff, 0xff, 0xff, 0xff, 0xff]);
- var socket = net.connect(server.address().port);
- var client = tls.connect({
+ const BAD_RECORD = Buffer.from([0xff, 0xff, 0xff, 0xff, 0xff, 0xff]);
+ const socket = net.connect(server.address().port);
+ const client = tls.connect({
 socket: socket,
 rejectUnauthorized: false
 }, function() {
 socket.write(BAD_RECORD);
 socket.end();
 });
- client.on('error', function(e) {
+ client.on('error', function() {
 // ignore error
 });
 }
-
-process.on('exit', function() {
- assert.strictEqual(iter, max_iter);
- assert(success);
-});

-Original file line number
+Diff line change
@@ @@ -1,6 +1,5 @@ @@
 'use strict';
 -varcommon=require('../common');
 -varassert=require('assert');
 +constcommon=require('../common');
 if(!common.opensslCli){
 common.skip('node compiled without OpenSSL CLI.');
 return;
+}
 -vartls=require('tls');
 -varnet=require('net');
 -varfs=require('fs');
+-
 -varsuccess=false;
 +consttls=require('tls');
 +constnet=require('net');
 +constfs=require('fs');
 functionfilenamePEM(n){
 returnrequire('path').join(common.fixturesDir,'keys',n+'.pem');
 returnfs.readFileSync(filenamePEM(n));
+}
 -varopts={
 +constopts={
 key: loadPEM('agent2-key'),
 cert: loadPEM('agent2-cert')
 };
 +constmax_iter=20;
 +letiter=0;
 -varmax_iter=20;
 -variter=0;
+-
 -varserver=tls.createServer(opts,function(s){
 +constserver=tls.createServer(opts,function(s){
 s.pipe(s);
 -s.on('error',function(e){
 +s.on('error',function(){
 // ignore error
 });
 });
 functionsendClient(){
 -varclient=tls.connect(server.address().port,{
 +constclient=tls.connect(server.address().port,{
 rejectUnauthorized: false
 });
 -client.on('data',function(chunk){
 +client.on('data',common.mustCall(function(){
 if(iter++===2)sendBADTLSRecord();
 if(iter<max_iter){
 client.write('a');
 return;
+}
 client.end();
 server.close();
 -success=true;
 -});
 +},max_iter));
 client.write('a');
 -client.on('error',function(e){
 +client.on('error',function(){
 // ignore error
 });
 client.on('close',function(){
 functionsendBADTLSRecord(){
 -varBAD_RECORD=Buffer.from([0xff,0xff,0xff,0xff,0xff,0xff]);
 -varsocket=net.connect(server.address().port);
 -varclient=tls.connect({
 +constBAD_RECORD=Buffer.from([0xff,0xff,0xff,0xff,0xff,0xff]);
 +constsocket=net.connect(server.address().port);
 +constclient=tls.connect({
 socket: socket,
 rejectUnauthorized: false
 },function(){
 socket.write(BAD_RECORD);
 socket.end();
 });
 -client.on('error',function(e){
 +client.on('error',function(){
 // ignore error
 });
+}
+-
 -process.on('exit',function(){
 -assert.strictEqual(iter,max_iter);
 -assert(success);
 -});