test: use mustCall in tls-connect-given-socket

vperezma · MylesBorins · commit 6e7b77fdbb51 · 2017-07-11T17:43:48.000+01:00
PR-URL: #12592 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/test/parallel/test-tls-connect-given-socket.js b/test/parallel/test-tls-connect-given-socket.js
@@ -11,26 +11,20 @@ const tls = require('tls');
 const net = require('net');
 const fs = require('fs');
 const path = require('path');
-
-let serverConnected = 0;
-let clientConnected = 0;
-
 const options = {
 key: fs.readFileSync(path.join(common.fixturesDir, 'test_key.pem')),
 cert: fs.readFileSync(path.join(common.fixturesDir, 'test_cert.pem'))
 };
 
-const server = tls.createServer(options, (socket) => {
- serverConnected++;
+const server = tls.createServer(options, common.mustCall((socket) => {
 socket.end('Hello');
-}).listen(0, () => {
+}, 2)).listen(0, common.mustCall(() => {
 let waiting = 2;
- function establish(socket) {
+ function establish(socket, calls) {
 const client = tls.connect({
 rejectUnauthorized: false,
 socket: socket
- }, () => {
- clientConnected++;
+ }, common.mustCall(() => {
 let data = '';
 client.on('data', common.mustCall((chunk) => {
 data += chunk.toString();
@@ -40,7 +34,7 @@ const server = tls.createServer(options, (socket) => {
 if (--waiting === 0)
 server.close();
 }));
- });
+ }, calls));
 assert(client.readable);
 assert(client.writable);
 
@@ -51,14 +45,14 @@ const server = tls.createServer(options, (socket) => {
 
 // Immediate death socket
 const immediateDeath = net.connect(port);
- establish(immediateDeath).destroy();
+ establish(immediateDeath, 0).destroy();
 
 // Outliving
 const outlivingTCP = net.connect(port, common.mustCall(() => {
 outlivingTLS.destroy();
 next();
 }));
- const outlivingTLS = establish(outlivingTCP);
+ const outlivingTLS = establish(outlivingTCP, 0);
 
 function next() {
 // Already connected socket
@@ -70,9 +64,4 @@ const server = tls.createServer(options, (socket) => {
 const connecting = net.connect(port);
 establish(connecting);
 }
-});
-
-process.on('exit', () => {
- assert.strictEqual(serverConnected, 2);
- assert.strictEqual(clientConnected, 2);
-});
+}));

-Original file line number
+Diff line change
 constnet=require('net');
 constfs=require('fs');
 constpath=require('path');
+-
 -letserverConnected=0;
 -letclientConnected=0;
+-
 constoptions={
 key: fs.readFileSync(path.join(common.fixturesDir,'test_key.pem')),
 cert: fs.readFileSync(path.join(common.fixturesDir,'test_cert.pem'))
 };
 -constserver=tls.createServer(options,(socket)=>{
 -serverConnected++;
 +constserver=tls.createServer(options,common.mustCall((socket)=>{
 socket.end('Hello');
 -}).listen(0,()=>{
 +},2)).listen(0,common.mustCall(()=>{
 letwaiting=2;
 -functionestablish(socket){
 +functionestablish(socket,calls){
 constclient=tls.connect({
 rejectUnauthorized: false,
 socket: socket
 -},()=>{
 -clientConnected++;
 +},common.mustCall(()=>{
 letdata='';
 client.on('data',common.mustCall((chunk)=>{
 data+=chunk.toString();
 if(--waiting===0)
 server.close();
 }));
 -});
 +},calls));
 assert(client.readable);
 assert(client.writable);
 // Immediate death socket
 constimmediateDeath=net.connect(port);
 -establish(immediateDeath).destroy();
 +establish(immediateDeath,0).destroy();
 // Outliving
 constoutlivingTCP=net.connect(port,common.mustCall(()=>{
 outlivingTLS.destroy();
 next();
 }));
 -constoutlivingTLS=establish(outlivingTCP);
 +constoutlivingTLS=establish(outlivingTCP,0);
 functionnext(){
 // Already connected socket
 constconnecting=net.connect(port);
 establish(connecting);
+}
 -});
+-
 -process.on('exit',()=>{
 -assert.strictEqual(serverConnected,2);
 -assert.strictEqual(clientConnected,2);
 -});
 +}));