Skip to content

Commit cffd51e

Browse files
russelltshermanMylesBorins
authored andcommitted
test: refactor test-tls-connect-simple
refactor var -> const/let refactor process.on('exit') into common.mustCall PR-URL: #9934 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 1424c25 commit cffd51e

File tree

1 file changed

+18
-33
lines changed

1 file changed

+18
-33
lines changed
Lines changed: 18 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,43 @@
11
'use strict';
2-
varcommon=require('../common');
3-
varassert=require('assert');
2+
constcommon=require('../common');
43

54
if(!common.hasCrypto){
65
common.skip('missing crypto');
76
return;
87
}
9-
vartls=require('tls');
8+
consttls=require('tls');
109

11-
varfs=require('fs');
10+
constfs=require('fs');
1211

13-
varclientConnected=0;
14-
varserverConnected=0;
15-
varserverCloseCallbacks=0;
16-
varserverCloseEvents=0;
12+
letserverConnected=0;
1713

18-
varoptions={
14+
constoptions={
1915
key: fs.readFileSync(common.fixturesDir+'/keys/agent1-key.pem'),
2016
cert: fs.readFileSync(common.fixturesDir+'/keys/agent1-cert.pem')
2117
};
2218

23-
varserver=tls.Server(options,function(socket){
19+
constserver=tls.Server(options,common.mustCall(function(socket){
2420
if(++serverConnected===2){
25-
server.close(function(){
26-
++serverCloseCallbacks;
27-
});
28-
server.on('close',function(){
29-
++serverCloseEvents;
30-
});
21+
server.close(common.mustCall(function(){}));
22+
server.on('close',common.mustCall(function(){}));
3123
}
32-
});
24+
},2));
3325

3426
server.listen(0,function(){
35-
varclient1=tls.connect({
27+
constclient1options={
3628
port: this.address().port,
3729
rejectUnauthorized: false
38-
},function(){
39-
++clientConnected;
30+
};
31+
constclient1=tls.connect(client1options,common.mustCall(function(){
4032
client1.end();
41-
});
33+
}));
4234

43-
varclient2=tls.connect({
35+
constclient2options={
4436
port: this.address().port,
4537
rejectUnauthorized: false
46-
});
47-
client2.on('secureConnect',function(){
48-
++clientConnected;
38+
};
39+
constclient2=tls.connect(client2options);
40+
client2.on('secureConnect',common.mustCall(function(){
4941
client2.end();
50-
});
51-
});
52-
53-
process.on('exit',function(){
54-
assert.equal(clientConnected,2);
55-
assert.equal(serverConnected,2);
56-
assert.equal(serverCloseCallbacks,1);
57-
assert.equal(serverCloseEvents,1);
42+
}));
5843
});

0 commit comments

Comments
(0)