@@ -32,26 +32,20 @@ const tls = require('tls');
32
32
const net = require ( 'net' ) ;
33
33
const fs = require ( 'fs' ) ;
34
34
const path = require ( 'path' ) ;
35
-
36
- let serverConnected = 0 ;
37
- let clientConnected = 0 ;
38
-
39
35
const options = {
40
36
key : fs . readFileSync ( path . join ( common . fixturesDir , 'test_key.pem' ) ) ,
41
37
cert : fs . readFileSync ( path . join ( common . fixturesDir , 'test_cert.pem' ) )
42
38
} ;
43
39
44
- const server = tls . createServer ( options , ( socket ) => {
45
- serverConnected ++ ;
40
+ const server = tls . createServer ( options , common . mustCall ( ( socket ) => {
46
41
socket . end ( 'Hello' ) ;
47
- } ) . listen ( 0 , ( ) => {
42
+ } , 2 ) ) . listen ( 0 , common . mustCall ( ( ) => {
48
43
let waiting = 2 ;
49
- function establish ( socket ) {
44
+ function establish ( socket , calls ) {
50
45
const client = tls . connect ( {
51
46
rejectUnauthorized : false ,
52
47
socket : socket
53
- } , ( ) => {
54
- clientConnected ++ ;
48
+ } , common . mustCall ( ( ) => {
55
49
let data = '' ;
56
50
client . on ( 'data' , common . mustCall ( ( chunk ) => {
57
51
data += chunk . toString ( ) ;
@@ -61,7 +55,7 @@ const server = tls.createServer(options, (socket) => {
61
55
if ( -- waiting === 0 )
62
56
server . close ( ) ;
63
57
} ) ) ;
64
- } ) ;
58
+ } , calls ) ) ;
65
59
assert ( client . readable ) ;
66
60
assert ( client . writable ) ;
67
61
@@ -72,14 +66,14 @@ const server = tls.createServer(options, (socket) => {
72
66
73
67
// Immediate death socket
74
68
const immediateDeath = net . connect ( port ) ;
75
- establish ( immediateDeath ) . destroy ( ) ;
69
+ establish ( immediateDeath , 0 ) . destroy ( ) ;
76
70
77
71
// Outliving
78
72
const outlivingTCP = net . connect ( port , common . mustCall ( ( ) => {
79
73
outlivingTLS . destroy ( ) ;
80
74
next ( ) ;
81
75
} ) ) ;
82
- const outlivingTLS = establish ( outlivingTCP ) ;
76
+ const outlivingTLS = establish ( outlivingTCP , 0 ) ;
83
77
84
78
function next ( ) {
85
79
// Already connected socket
@@ -91,9 +85,4 @@ const server = tls.createServer(options, (socket) => {
91
85
const connecting = net . connect ( port ) ;
92
86
establish ( connecting ) ;
93
87
}
94
- } ) ;
95
-
96
- process . on ( 'exit' , ( ) => {
97
- assert . strictEqual ( serverConnected , 2 ) ;
98
- assert . strictEqual ( clientConnected , 2 ) ;
99
- } ) ;
88
+ } ) ) ;
0 commit comments