|
1 | 1 | 'use strict'; |
2 | | -var common = require('../common'); |
3 | | -var assert = require('assert'); |
| 2 | +const common = require('../common'); |
4 | 3 |
|
5 | 4 | if (!common.hasCrypto) { |
6 | 5 | common.skip('missing crypto'); |
7 | 6 | return; |
8 | 7 | } |
9 | | -var tls = require('tls'); |
| 8 | +const tls = require('tls'); |
10 | 9 |
|
11 | | -var fs = require('fs'); |
| 10 | +const fs = require('fs'); |
12 | 11 |
|
13 | | -var clientConnected = 0; |
14 | | -var serverConnected = 0; |
15 | | -var serverCloseCallbacks = 0; |
16 | | -var serverCloseEvents = 0; |
| 12 | +let serverConnected = 0; |
17 | 13 |
|
18 | | -var options = { |
| 14 | +const options = { |
19 | 15 | key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'), |
20 | 16 | cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem') |
21 | 17 | }; |
22 | 18 |
|
23 | | -var server = tls.Server(options, function(socket) { |
| 19 | +const server = tls.Server(options, common.mustCall(function(socket) { |
24 | 20 | 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() {})); |
31 | 23 | } |
32 | | -}); |
| 24 | +}, 2)); |
33 | 25 |
|
34 | 26 | server.listen(0, function() { |
35 | | - var client1 = tls.connect({ |
| 27 | + const client1options = { |
36 | 28 | port: this.address().port, |
37 | 29 | rejectUnauthorized: false |
38 | | - }, function() { |
39 | | - ++clientConnected; |
| 30 | + }; |
| 31 | + const client1 = tls.connect(client1options, common.mustCall(function() { |
40 | 32 | client1.end(); |
41 | | - }); |
| 33 | + })); |
42 | 34 |
|
43 | | - var client2 = tls.connect({ |
| 35 | + const client2options = { |
44 | 36 | port: this.address().port, |
45 | 37 | rejectUnauthorized: false |
46 | | - }); |
47 | | - client2.on('secureConnect', function() { |
48 | | - ++clientConnected; |
| 38 | + }; |
| 39 | + const client2 = tls.connect(client2options); |
| 40 | + client2.on('secureConnect', common.mustCall(function() { |
49 | 41 | 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 | + })); |
58 | 43 | }); |
0 commit comments