@@ -11,26 +11,20 @@ const tls = require('tls');
11
11
const net = require ( 'net' ) ;
12
12
const fs = require ( 'fs' ) ;
13
13
const path = require ( 'path' ) ;
14
-
15
- let serverConnected = 0 ;
16
- let clientConnected = 0 ;
17
-
18
14
const options = {
19
15
key : fs . readFileSync ( path . join ( common . fixturesDir , 'test_key.pem' ) ) ,
20
16
cert : fs . readFileSync ( path . join ( common . fixturesDir , 'test_cert.pem' ) )
21
17
} ;
22
18
23
- const server = tls . createServer ( options , ( socket ) => {
24
- serverConnected ++ ;
19
+ const server = tls . createServer ( options , common . mustCall ( ( socket ) => {
25
20
socket . end ( 'Hello' ) ;
26
- } ) . listen ( 0 , ( ) => {
21
+ } , 2 ) ) . listen ( 0 , common . mustCall ( ( ) => {
27
22
let waiting = 2 ;
28
- function establish ( socket ) {
23
+ function establish ( socket , calls ) {
29
24
const client = tls . connect ( {
30
25
rejectUnauthorized : false ,
31
26
socket : socket
32
- } , ( ) => {
33
- clientConnected ++ ;
27
+ } , common . mustCall ( ( ) => {
34
28
let data = '' ;
35
29
client . on ( 'data' , common . mustCall ( ( chunk ) => {
36
30
data += chunk . toString ( ) ;
@@ -40,7 +34,7 @@ const server = tls.createServer(options, (socket) => {
40
34
if ( -- waiting === 0 )
41
35
server . close ( ) ;
42
36
} ) ) ;
43
- } ) ;
37
+ } , calls ) ) ;
44
38
assert ( client . readable ) ;
45
39
assert ( client . writable ) ;
46
40
@@ -51,14 +45,14 @@ const server = tls.createServer(options, (socket) => {
51
45
52
46
// Immediate death socket
53
47
const immediateDeath = net . connect ( port ) ;
54
- establish ( immediateDeath ) . destroy ( ) ;
48
+ establish ( immediateDeath , 0 ) . destroy ( ) ;
55
49
56
50
// Outliving
57
51
const outlivingTCP = net . connect ( port , common . mustCall ( ( ) => {
58
52
outlivingTLS . destroy ( ) ;
59
53
next ( ) ;
60
54
} ) ) ;
61
- const outlivingTLS = establish ( outlivingTCP ) ;
55
+ const outlivingTLS = establish ( outlivingTCP , 0 ) ;
62
56
63
57
function next ( ) {
64
58
// Already connected socket
@@ -70,9 +64,4 @@ const server = tls.createServer(options, (socket) => {
70
64
const connecting = net . connect ( port ) ;
71
65
establish ( connecting ) ;
72
66
}
73
- } ) ;
74
-
75
- process . on ( 'exit' , ( ) => {
76
- assert . strictEqual ( serverConnected , 2 ) ;
77
- assert . strictEqual ( clientConnected , 2 ) ;
78
- } ) ;
67
+ } ) ) ;
0 commit comments