@@ -23,38 +23,28 @@ function run() {
2323}
2424
2525test ( function serverTimeout ( cb ) {
26- let caughtTimeout = false ;
27- process . on ( 'exit' , function ( ) {
28- assert ( caughtTimeout ) ;
29- } ) ;
3026 const server = http . createServer ( function ( req , res ) {
3127 // just do nothing, we should get a timeout event.
3228 } ) ;
3329 server . listen ( common . mustCall ( function ( ) {
3430 http . get ( { port : server . address ( ) . port } ) . on ( 'error' , common . noop ) ;
3531 } ) ) ;
36- const s = server . setTimeout ( 50 , function ( socket ) {
37- caughtTimeout = true ;
32+ const s = server . setTimeout ( 50 , common . mustCall ( function ( socket ) {
3833 socket . destroy ( ) ;
3934 server . close ( ) ;
4035 cb ( ) ;
41- } ) ;
36+ } ) ) ;
4237 assert . ok ( s instanceof http . Server ) ;
4338} ) ;
4439
4540test ( function serverRequestTimeout ( cb ) {
46- let caughtTimeout = false ;
47- process . on ( 'exit' , function ( ) {
48- assert ( caughtTimeout ) ;
49- } ) ;
5041 const server = http . createServer ( function ( req , res ) {
5142 // 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 ( ) ;
5545 server . close ( ) ;
5646 cb ( ) ;
57- } ) ;
47+ } ) ) ;
5848 assert . ok ( s instanceof http . IncomingMessage ) ;
5949 } ) ;
6050 server . listen ( common . mustCall ( function ( ) {
@@ -67,18 +57,13 @@ test(function serverRequestTimeout(cb) {
6757} ) ;
6858
6959test ( function serverResponseTimeout ( cb ) {
70- let caughtTimeout = false ;
71- process . on ( 'exit' , function ( ) {
72- assert ( caughtTimeout ) ;
73- } ) ;
7460 const server = http . createServer ( function ( req , res ) {
7561 // 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 ( ) ;
7964 server . close ( ) ;
8065 cb ( ) ;
81- } ) ;
66+ } ) ) ;
8267 assert . ok ( s instanceof http . OutgoingMessage ) ;
8368 } ) ;
8469 server . listen ( common . mustCall ( function ( ) {
@@ -88,21 +73,11 @@ test(function serverResponseTimeout(cb) {
8873} ) ;
8974
9075test ( function serverRequestNotTimeoutAfterEnd ( cb ) {
91- let caughtTimeoutOnRequest = false ;
92- let caughtTimeoutOnResponse = false ;
93- process . on ( 'exit' , function ( ) {
94- assert ( ! caughtTimeoutOnRequest ) ;
95- assert ( caughtTimeoutOnResponse ) ;
96- } ) ;
9776 const server = http . createServer ( function ( req , res ) {
9877 // 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 ( ) ) ;
10279 assert . ok ( s instanceof http . IncomingMessage ) ;
103- res . on ( 'timeout' , function ( socket ) {
104- caughtTimeoutOnResponse = true ;
105- } ) ;
80+ res . on ( 'timeout' , common . mustCall ( ) ) ;
10681 } ) ;
10782 server . on ( 'timeout' , function ( socket ) {
10883 socket . destroy ( ) ;
@@ -148,29 +123,16 @@ test(function serverResponseTimeoutWithPipeline(cb) {
148123} ) ;
149124
150125test ( 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- } ) ;
159126 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 ( ) ) ;
166129 res . end ( ) ;
167130 } ) ;
168- const s = server . setTimeout ( 50 , function ( socket ) {
169- caughtTimeoutOnServer = true ;
131+ const s = server . setTimeout ( 50 , common . mustCall ( function ( socket ) {
170132 socket . destroy ( ) ;
171133 server . close ( ) ;
172134 cb ( ) ;
173- } ) ;
135+ } ) ) ;
174136 assert . ok ( s instanceof http . Server ) ;
175137 server . listen ( common . mustCall ( function ( ) {
176138 const port = server . address ( ) . port ;
0 commit comments