@@ -23,38 +23,28 @@ function run() {
23
23
}
24
24
25
25
test ( function serverTimeout ( cb ) {
26
- let caughtTimeout = false ;
27
- process . on ( 'exit' , function ( ) {
28
- assert ( caughtTimeout ) ;
29
- } ) ;
30
26
const server = http . createServer ( function ( req , res ) {
31
27
// just do nothing, we should get a timeout event.
32
28
} ) ;
33
29
server . listen ( common . mustCall ( function ( ) {
34
30
http . get ( { port : server . address ( ) . port } ) . on ( 'error' , common . noop ) ;
35
31
} ) ) ;
36
- const s = server . setTimeout ( 50 , function ( socket ) {
37
- caughtTimeout = true ;
32
+ const s = server . setTimeout ( 50 , common . mustCall ( function ( socket ) {
38
33
socket . destroy ( ) ;
39
34
server . close ( ) ;
40
35
cb ( ) ;
41
- } ) ;
36
+ } ) ) ;
42
37
assert . ok ( s instanceof http . Server ) ;
43
38
} ) ;
44
39
45
40
test ( function serverRequestTimeout ( cb ) {
46
- let caughtTimeout = false ;
47
- process . on ( 'exit' , function ( ) {
48
- assert ( caughtTimeout ) ;
49
- } ) ;
50
41
const server = http . createServer ( function ( req , res ) {
51
42
// just do nothing, we should get a timeout event.
52
- const s = req . setTimeout ( 50 , function ( ) {
53
- caughtTimeout = true ;
54
- req . socket . destroy ( ) ;
43
+ const s = req . setTimeout ( 50 , common . mustCall ( function ( socket ) {
44
+ socket . destroy ( ) ;
55
45
server . close ( ) ;
56
46
cb ( ) ;
57
- } ) ;
47
+ } ) ) ;
58
48
assert . ok ( s instanceof http . IncomingMessage ) ;
59
49
} ) ;
60
50
server . listen ( common . mustCall ( function ( ) {
@@ -67,18 +57,13 @@ test(function serverRequestTimeout(cb) {
67
57
} ) ;
68
58
69
59
test ( function serverResponseTimeout ( cb ) {
70
- let caughtTimeout = false ;
71
- process . on ( 'exit' , function ( ) {
72
- assert ( caughtTimeout ) ;
73
- } ) ;
74
60
const server = http . createServer ( function ( req , res ) {
75
61
// just do nothing, we should get a timeout event.
76
- const s = res . setTimeout ( 50 , function ( ) {
77
- caughtTimeout = true ;
78
- res . socket . destroy ( ) ;
62
+ const s = res . setTimeout ( 50 , common . mustCall ( function ( socket ) {
63
+ socket . destroy ( ) ;
79
64
server . close ( ) ;
80
65
cb ( ) ;
81
- } ) ;
66
+ } ) ) ;
82
67
assert . ok ( s instanceof http . OutgoingMessage ) ;
83
68
} ) ;
84
69
server . listen ( common . mustCall ( function ( ) {
@@ -88,21 +73,11 @@ test(function serverResponseTimeout(cb) {
88
73
} ) ;
89
74
90
75
test ( function serverRequestNotTimeoutAfterEnd ( cb ) {
91
- let caughtTimeoutOnRequest = false ;
92
- let caughtTimeoutOnResponse = false ;
93
- process . on ( 'exit' , function ( ) {
94
- assert ( ! caughtTimeoutOnRequest ) ;
95
- assert ( caughtTimeoutOnResponse ) ;
96
- } ) ;
97
76
const server = http . createServer ( function ( req , res ) {
98
77
// just do nothing, we should get a timeout event.
99
- const s = req . setTimeout ( 50 , function ( socket ) {
100
- caughtTimeoutOnRequest = true ;
101
- } ) ;
78
+ const s = req . setTimeout ( 50 , common . mustNotCall ( ) ) ;
102
79
assert . ok ( s instanceof http . IncomingMessage ) ;
103
- res . on ( 'timeout' , function ( socket ) {
104
- caughtTimeoutOnResponse = true ;
105
- } ) ;
80
+ res . on ( 'timeout' , common . mustCall ( ) ) ;
106
81
} ) ;
107
82
server . on ( 'timeout' , function ( socket ) {
108
83
socket . destroy ( ) ;
@@ -148,29 +123,16 @@ test(function serverResponseTimeoutWithPipeline(cb) {
148
123
} ) ;
149
124
150
125
test ( function idleTimeout ( cb ) {
151
- let caughtTimeoutOnRequest = false ;
152
- let caughtTimeoutOnResponse = false ;
153
- let caughtTimeoutOnServer = false ;
154
- process . on ( 'exit' , function ( ) {
155
- assert ( ! caughtTimeoutOnRequest ) ;
156
- assert ( ! caughtTimeoutOnResponse ) ;
157
- assert ( caughtTimeoutOnServer ) ;
158
- } ) ;
159
126
const server = http . createServer ( function ( req , res ) {
160
- req . on ( 'timeout' , function ( socket ) {
161
- caughtTimeoutOnRequest = true ;
162
- } ) ;
163
- res . on ( 'timeout' , function ( socket ) {
164
- caughtTimeoutOnResponse = true ;
165
- } ) ;
127
+ req . on ( 'timeout' , common . mustNotCall ( ) ) ;
128
+ res . on ( 'timeout' , common . mustNotCall ( ) ) ;
166
129
res . end ( ) ;
167
130
} ) ;
168
- const s = server . setTimeout ( 50 , function ( socket ) {
169
- caughtTimeoutOnServer = true ;
131
+ const s = server . setTimeout ( 50 , common . mustCall ( function ( socket ) {
170
132
socket . destroy ( ) ;
171
133
server . close ( ) ;
172
134
cb ( ) ;
173
- } ) ;
135
+ } ) ) ;
174
136
assert . ok ( s instanceof http . Server ) ;
175
137
server . listen ( common . mustCall ( function ( ) {
176
138
const port = server . address ( ) . port ;
0 commit comments