Skip to content

Commit fca534d

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 b530d5a commit fca534d

File tree

1 file changed

+18
-33
lines changed

1 file changed

+18
-33
lines changed
+18-33
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,43 @@
11
'use strict';
2-
var common = require('../common');
3-
var assert = require('assert');
2+
const common = require('../common');
43

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

11-
var fs = require('fs');
10+
const fs = require('fs');
1211

13-
var clientConnected = 0;
14-
var serverConnected = 0;
15-
var serverCloseCallbacks = 0;
16-
var serverCloseEvents = 0;
12+
let serverConnected = 0;
1713

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

23-
var server = tls.Server(options, function(socket) {
19+
const server = 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-
var client1 = tls.connect({
27+
const client1options = {
3628
port: this.address().port,
3729
rejectUnauthorized: false
38-
}, function() {
39-
++clientConnected;
30+
};
31+
const client1 = tls.connect(client1options, common.mustCall(function() {
4032
client1.end();
41-
});
33+
}));
4234

43-
var client2 = tls.connect({
35+
const client2options = {
4436
port: this.address().port,
4537
rejectUnauthorized: false
46-
});
47-
client2.on('secureConnect', function() {
48-
++clientConnected;
38+
};
39+
const client2 = 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)