Skip to content

Commit 6d742b3

Browse files
BethGriggsMyles Borins
authored andcommitted
test: remove err timer from test-http-set-timeout
Removed the errorTimer from test-http-set-timeout.js, as this timer is not necessary to test the setTimeout functionality. Also edited the console.log message on line 8 to log the correct timeout duration. Changed var to const, and added common.mustCall() to on timeout and on error callbacks. Fixes: #9256 PR-URL: #9264 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 462c640 commit 6d742b3

File tree

1 file changed

+13
-19
lines changed

1 file changed

+13
-19
lines changed
Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,26 @@
11
'use strict';
2-
varcommon=require('../common');
3-
varassert=require('assert');
4-
varhttp=require('http');
5-
varnet=require('net');
2+
constcommon=require('../common');
3+
constassert=require('assert');
4+
consthttp=require('http');
5+
constnet=require('net');
66

77
varserver=http.createServer(function(req,res){
8-
console.log('got request. setting 1 second timeout');
9-
vars=req.connection.setTimeout(500);
10-
assert.ok(sinstanceofnet.Socket);
11-
req.connection.on('timeout',function(){
8+
console.log('got request. setting 500ms timeout');
9+
varsocket=req.connection.setTimeout(500);
10+
assert.ok(socketinstanceofnet.Socket);
11+
req.connection.on('timeout',common.mustCall(function(){
1212
req.connection.destroy();
1313
console.error('TIMEOUT');
1414
server.close();
15-
});
15+
}));
1616
});
1717

1818
server.listen(0,function(){
1919
console.log(`Server running at http://127.0.0.1:${this.address().port}/`);
2020

21-
varerrorTimer=setTimeout(function(){
22-
thrownewError('Timeout was not successful');
23-
},common.platformTimeout(2000));
24-
25-
varx=http.get({port: this.address().port,path: '/'});
26-
x.on('error',function(){
27-
clearTimeout(errorTimer);
21+
varrequest=http.get({port: this.address().port,path: '/'});
22+
request.on('error',common.mustCall(function(){
2823
console.log('HTTP REQUEST COMPLETE (this is good)');
29-
});
30-
x.end();
31-
24+
}));
25+
request.end();
3226
});

0 commit comments

Comments
(0)