Skip to content

Commit

Permalink
test: remove err timer from test-http-set-timeout
Browse files Browse the repository at this point in the history
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 <rtrott@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
BethGriggs authored and Myles Borins committed Nov 22, 2016
1 parent 462c640 commit 6d742b3
Showing 1 changed file with 13 additions and 19 deletions.
32 changes: 13 additions & 19 deletions test/parallel/test-http-set-timeout.js
Original file line number Diff line number Diff line change
@@ -1,32 +1,26 @@
'use strict';
var common = require('../common');
var assert = require('assert');
var http = require('http');
var net = require('net');
const common = require('../common');
const assert = require('assert');
const http = require('http');
const net = require('net');

var server = http.createServer(function(req, res) {
console.log('got request. setting 1 second timeout');
var s = req.connection.setTimeout(500);
assert.ok(s instanceof net.Socket);
req.connection.on('timeout', function() {
console.log('got request. setting 500ms timeout');
var socket = req.connection.setTimeout(500);
assert.ok(socket instanceof net.Socket);
req.connection.on('timeout', common.mustCall(function() {
req.connection.destroy();
console.error('TIMEOUT');
server.close();
});
}));
});

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

var errorTimer = setTimeout(function() {
throw new Error('Timeout was not successful');
}, common.platformTimeout(2000));

var x = http.get({port: this.address().port, path: '/'});
x.on('error', function() {
clearTimeout(errorTimer);
var request = http.get({port: this.address().port, path: '/'});
request.on('error', common.mustCall(function() {
console.log('HTTP REQUEST COMPLETE (this is good)');
});
x.end();

}));
request.end();
});

0 comments on commit 6d742b3

Please sign in to comment.