Skip to content

Harmonize test http https set timeout server #13625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jklepatch wants to merge 3 commits into from
Closed

Harmonize test http https set timeout server #13625

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
752b395
Added secReceived check in test_http_set_timeout-server.js
jklepatch Jun 12, 2017
ed14e44
Updated test-http-set-timeout-server.js to use common.mustCall / must…
jklepatch Jun 12, 2017
4407446
Removed useless space
jklepatch Jun 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated test-http-set-timeout-server.js to use common.mustCall / must… 
…NotCall
  • Loading branch information
@jklepatch
jklepatch committed Jun 12, 2017
commit ed14e44a04ac9bf6bd860668bf92711bac3e4fe3
66 changes: 14 additions & 52 deletions test/parallel/test-http-set-timeout-server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,38 +44,28 @@ function run() {
}

test(function serverTimeout(cb) {
let caughtTimeout = false;
process.on('exit', function() {
assert(caughtTimeout);
});
const server = http.createServer(function(req, res) {
// just do nothing, we should get a timeout event.
});
server.listen(common.mustCall(function() {
http.get({ port: server.address().port }).on('error', common.noop);
}));
const s = server.setTimeout(50, function(socket) {
caughtTimeout = true;
const s = server.setTimeout(50, common.mustCall(function(socket) {
socket.destroy();
server.close();
cb();
});
}));
assert.ok(s instanceof http.Server);
});

test(function serverRequestTimeout(cb) {
let caughtTimeout = false;
process.on('exit', function() {
assert(caughtTimeout);
});
const server = http.createServer(function(req, res) {
// just do nothing, we should get a timeout event.
const s = req.setTimeout(50, function() {
caughtTimeout = true;
req.socket.destroy();
const s = req.setTimeout(50, common.mustCall(function(socket) {

@aqrln aqrln Jun 16, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: one of the spaces after the comma is superfluous.

socket.destroy();
server.close();
cb();
});
}));
assert.ok(s instanceof http.IncomingMessage);
});
server.listen(common.mustCall(function() {
Expand All @@ -88,18 +78,13 @@ test(function serverRequestTimeout(cb) {
});

test(function serverResponseTimeout(cb) {
let caughtTimeout = false;
process.on('exit', function() {
assert(caughtTimeout);
});
const server = http.createServer(function(req, res) {
// just do nothing, we should get a timeout event.
const s = res.setTimeout(50, function() {
caughtTimeout = true;
res.socket.destroy();
const s = res.setTimeout(50, common.mustCall(function(socket) {
socket.destroy();
server.close();
cb();
});
}));
assert.ok(s instanceof http.OutgoingMessage);
});
server.listen(common.mustCall(function() {
Expand All @@ -109,21 +94,11 @@ test(function serverResponseTimeout(cb) {
});

test(function serverRequestNotTimeoutAfterEnd(cb) {
let caughtTimeoutOnRequest = false;
let caughtTimeoutOnResponse = false;
process.on('exit', function() {
assert(!caughtTimeoutOnRequest);
assert(caughtTimeoutOnResponse);
});
const server = http.createServer(function(req, res) {
// just do nothing, we should get a timeout event.
const s = req.setTimeout(50, function(socket) {
caughtTimeoutOnRequest = true;
});
const s = req.setTimeout(50, common.mustNotCall());
assert.ok(s instanceof http.IncomingMessage);
res.on('timeout', function(socket) {
caughtTimeoutOnResponse = true;
});
res.on('timeout', common.mustCall());
});
server.on('timeout', function(socket) {
socket.destroy();
Expand Down Expand Up @@ -169,29 +144,16 @@ test(function serverResponseTimeoutWithPipeline(cb) {
});

test(function idleTimeout(cb) {
let caughtTimeoutOnRequest = false;
let caughtTimeoutOnResponse = false;
let caughtTimeoutOnServer = false;
process.on('exit', function() {
assert(!caughtTimeoutOnRequest);
assert(!caughtTimeoutOnResponse);
assert(caughtTimeoutOnServer);
});
const server = http.createServer(function(req, res) {
req.on('timeout', function(socket) {
caughtTimeoutOnRequest = true;
});
res.on('timeout', function(socket) {
caughtTimeoutOnResponse = true;
});
req.on('timeout', common.mustNotCall());
res.on('timeout', common.mustNotCall());
res.end();
});
const s = server.setTimeout(50, function(socket) {
caughtTimeoutOnServer = true;
const s = server.setTimeout(50, common.mustCall(function(socket) {
socket.destroy();
server.close();
cb();
});
}));
assert.ok(s instanceof http.Server);
server.listen(common.mustCall(function() {
const port = server.address().port;
Expand Down