Browse Source

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: https://github.com/nodejs/node/issues/9256
PR-URL: https://github.com/nodejs/node/pull/9264
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
v6.x
BethGriggs 8 years ago
committed by Myles Borins
parent
commit
0c32b03bdc
  1. 32
      test/parallel/test-http-set-timeout.js

32
test/parallel/test-http-set-timeout.js

@ -1,32 +1,26 @@
'use strict'; 'use strict';
var common = require('../common'); const common = require('../common');
var assert = require('assert'); const assert = require('assert');
var http = require('http'); const http = require('http');
var net = require('net'); const net = require('net');
var server = http.createServer(function(req, res) { var server = http.createServer(function(req, res) {
console.log('got request. setting 1 second timeout'); console.log('got request. setting 500ms timeout');
var s = req.connection.setTimeout(500); var socket = req.connection.setTimeout(500);
assert.ok(s instanceof net.Socket); assert.ok(socket instanceof net.Socket);
req.connection.on('timeout', function() { req.connection.on('timeout', common.mustCall(function() {
req.connection.destroy(); req.connection.destroy();
console.error('TIMEOUT'); console.error('TIMEOUT');
server.close(); server.close();
}); }));
}); });
server.listen(0, function() { server.listen(0, function() {
console.log(`Server running at http://127.0.0.1:${this.address().port}/`); console.log(`Server running at http://127.0.0.1:${this.address().port}/`);
var errorTimer = setTimeout(function() { var request = http.get({port: this.address().port, path: '/'});
throw new Error('Timeout was not successful'); request.on('error', common.mustCall(function() {
}, common.platformTimeout(2000));
var x = http.get({port: this.address().port, path: '/'});
x.on('error', function() {
clearTimeout(errorTimer);
console.log('HTTP REQUEST COMPLETE (this is good)'); console.log('HTTP REQUEST COMPLETE (this is good)');
}); }));
x.end(); request.end();
}); });

Loading…
Cancel
Save