@@ -44,38 +44,28 @@ function run() {
44
44
}
45
45
46
46
test ( function serverTimeout ( cb ) {
47
- let caughtTimeout = false ;
48
- process . on ( 'exit' , function ( ) {
49
- assert ( caughtTimeout ) ;
50
- } ) ;
51
47
const server = http . createServer ( function ( req , res ) {
52
48
// just do nothing, we should get a timeout event.
53
49
} ) ;
54
50
server . listen ( common . mustCall ( function ( ) {
55
51
http . get ( { port : server . address ( ) . port } ) . on ( 'error' , common . noop ) ;
56
52
} ) ) ;
57
- const s = server . setTimeout ( 50 , function ( socket ) {
58
- caughtTimeout = true ;
53
+ const s = server . setTimeout ( 50 , common . mustCall ( function ( socket ) {
59
54
socket . destroy ( ) ;
60
55
server . close ( ) ;
61
56
cb ( ) ;
62
- } ) ;
57
+ } ) ) ;
63
58
assert . ok ( s instanceof http . Server ) ;
64
59
} ) ;
65
60
66
61
test ( function serverRequestTimeout ( cb ) {
67
- let caughtTimeout = false ;
68
- process . on ( 'exit' , function ( ) {
69
- assert ( caughtTimeout ) ;
70
- } ) ;
71
62
const server = http . createServer ( function ( req , res ) {
72
63
// just do nothing, we should get a timeout event.
73
- const s = req . setTimeout ( 50 , function ( ) {
74
- caughtTimeout = true ;
75
- req . socket . destroy ( ) ;
64
+ const s = req . setTimeout ( 50 , common . mustCall ( function ( socket ) {
65
+ socket . destroy ( ) ;
76
66
server . close ( ) ;
77
67
cb ( ) ;
78
- } ) ;
68
+ } ) ) ;
79
69
assert . ok ( s instanceof http . IncomingMessage ) ;
80
70
} ) ;
81
71
server . listen ( common . mustCall ( function ( ) {
@@ -88,18 +78,13 @@ test(function serverRequestTimeout(cb) {
88
78
} ) ;
89
79
90
80
test ( function serverResponseTimeout ( cb ) {
91
- let caughtTimeout = false ;
92
- process . on ( 'exit' , function ( ) {
93
- assert ( caughtTimeout ) ;
94
- } ) ;
95
81
const server = http . createServer ( function ( req , res ) {
96
82
// just do nothing, we should get a timeout event.
97
- const s = res . setTimeout ( 50 , function ( ) {
98
- caughtTimeout = true ;
99
- res . socket . destroy ( ) ;
83
+ const s = res . setTimeout ( 50 , common . mustCall ( function ( socket ) {
84
+ socket . destroy ( ) ;
100
85
server . close ( ) ;
101
86
cb ( ) ;
102
- } ) ;
87
+ } ) ) ;
103
88
assert . ok ( s instanceof http . OutgoingMessage ) ;
104
89
} ) ;
105
90
server . listen ( common . mustCall ( function ( ) {
@@ -109,21 +94,11 @@ test(function serverResponseTimeout(cb) {
109
94
} ) ;
110
95
111
96
test ( function serverRequestNotTimeoutAfterEnd ( cb ) {
112
- let caughtTimeoutOnRequest = false ;
113
- let caughtTimeoutOnResponse = false ;
114
- process . on ( 'exit' , function ( ) {
115
- assert ( ! caughtTimeoutOnRequest ) ;
116
- assert ( caughtTimeoutOnResponse ) ;
117
- } ) ;
118
97
const server = http . createServer ( function ( req , res ) {
119
98
// just do nothing, we should get a timeout event.
120
- const s = req . setTimeout ( 50 , function ( socket ) {
121
- caughtTimeoutOnRequest = true ;
122
- } ) ;
99
+ const s = req . setTimeout ( 50 , common . mustNotCall ( ) ) ;
123
100
assert . ok ( s instanceof http . IncomingMessage ) ;
124
- res . on ( 'timeout' , function ( socket ) {
125
- caughtTimeoutOnResponse = true ;
126
- } ) ;
101
+ res . on ( 'timeout' , common . mustCall ( ) ) ;
127
102
} ) ;
128
103
server . on ( 'timeout' , function ( socket ) {
129
104
socket . destroy ( ) ;
@@ -169,29 +144,16 @@ test(function serverResponseTimeoutWithPipeline(cb) {
169
144
} ) ;
170
145
171
146
test ( function idleTimeout ( cb ) {
172
- let caughtTimeoutOnRequest = false ;
173
- let caughtTimeoutOnResponse = false ;
174
- let caughtTimeoutOnServer = false ;
175
- process . on ( 'exit' , function ( ) {
176
- assert ( ! caughtTimeoutOnRequest ) ;
177
- assert ( ! caughtTimeoutOnResponse ) ;
178
- assert ( caughtTimeoutOnServer ) ;
179
- } ) ;
180
147
const server = http . createServer ( function ( req , res ) {
181
- req . on ( 'timeout' , function ( socket ) {
182
- caughtTimeoutOnRequest = true ;
183
- } ) ;
184
- res . on ( 'timeout' , function ( socket ) {
185
- caughtTimeoutOnResponse = true ;
186
- } ) ;
148
+ req . on ( 'timeout' , common . mustNotCall ( ) ) ;
149
+ res . on ( 'timeout' , common . mustNotCall ( ) ) ;
187
150
res . end ( ) ;
188
151
} ) ;
189
- const s = server . setTimeout ( 50 , function ( socket ) {
190
- caughtTimeoutOnServer = true ;
152
+ const s = server . setTimeout ( 50 , common . mustCall ( function ( socket ) {
191
153
socket . destroy ( ) ;
192
154
server . close ( ) ;
193
155
cb ( ) ;
194
- } ) ;
156
+ } ) ) ;
195
157
assert . ok ( s instanceof http . Server ) ;
196
158
server . listen ( common . mustCall ( function ( ) {
197
159
const port = server . address ( ) . port ;
0 commit comments