Skip to content

Commit 5045982

Browse files
committed
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
1 parent 2a45616 commit 5045982

File tree

1 file changed

+13
-19
lines changed

1 file changed

+13
-19
lines changed
+13-19
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,26 @@
11
'use strict';
2-
var common = require('../common');
3-
var assert = require('assert');
4-
var http = require('http');
5-
var net = require('net');
2+
const common = require('../common');
3+
const assert = require('assert');
4+
const http = require('http');
5+
const net = require('net');
66

77
var server = http.createServer(function(req, res) {
8-
console.log('got request. setting 1 second timeout');
9-
var s = req.connection.setTimeout(500);
10-
assert.ok(s instanceof net.Socket);
11-
req.connection.on('timeout', function() {
8+
console.log('got request. setting 500ms timeout');
9+
var socket = req.connection.setTimeout(500);
10+
assert.ok(socket instanceof net.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-
var errorTimer = setTimeout(function() {
22-
throw new Error('Timeout was not successful');
23-
}, common.platformTimeout(2000));
24-
25-
var x = http.get({port: this.address().port, path: '/'});
26-
x.on('error', function() {
27-
clearTimeout(errorTimer);
21+
var request = 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)