1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: refactor test-http(s)-set-timeout-server

Browse Source 
* Make changes to `test-https-set-timeout-server` to resolve
  inconsistencies with its http counterpart:

  - Apply the changes analogous to those in GH-13802 to the https test.
  - Add a missing `common.mustCall()` wrapper.
  - Make small stylistic changes (e.g., remove unnecessary line breaks
    in comments) to make it visually consistent with the http test.

* Use arrow functions.

PR-URL: https://github.com/nodejs/node/pull/13935
Fixes: https://github.com/nodejs/node/issues/13588
Refs: https://github.com/nodejs/node/pull/13802
Refs: https://github.com/nodejs/node/pull/13625
Refs: https://github.com/nodejs/node/pull/13822
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Alexey Orlenko 2017-06-26 21:41:28 +03:00 committed by Refael Ackermann
parent fe730d34ce
commit 932ee65cd2
No known key found for this signature in database
GPG Key ID: CD704BD80FDDDB64
2 changed files with 53 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
test/parallel/test-http-set-timeout-server.js
View File

@ -42,11 +42,11 @@ function run() {
} }
test(function serverTimeout(cb) { test(function serverTimeout(cb) {
const server = http.createServer(common.mustCall(function(req, res) { const server = http.createServer(common.mustCall((req, res) => {
// just do nothing, we should get a timeout event. // just do nothing, we should get a timeout event.
})); }));
server.listen(common.mustCall(function() { server.listen(common.mustCall(() => {
const s = server.setTimeout(50, common.mustCall(function(socket) { const s = server.setTimeout(50, common.mustCall((socket) => {
socket.destroy(); socket.destroy();
server.close(); server.close();
cb(); cb();
@ -59,16 +59,16 @@ test(function serverTimeout(cb) {
}); });
test(function serverRequestTimeout(cb) { test(function serverRequestTimeout(cb) {
const server = http.createServer(common.mustCall(function(req, res) { const server = http.createServer(common.mustCall((req, res) => {
// just do nothing, we should get a timeout event. // just do nothing, we should get a timeout event.
const s = req.setTimeout(50, common.mustCall(function(socket) { const s = req.setTimeout(50, common.mustCall((socket) => {
socket.destroy(); socket.destroy();
server.close(); server.close();
cb(); cb();
})); }));
assert.ok(s instanceof http.IncomingMessage); assert.ok(s instanceof http.IncomingMessage);
})); }));
server.listen(common.mustCall(function() { server.listen(common.mustCall(() => {
const req = http.request({ const req = http.request({
port: server.address().port, port: server.address().port,
method: 'POST' method: 'POST'
@ -80,16 +80,16 @@ test(function serverRequestTimeout(cb) {
}); });
test(function serverResponseTimeout(cb) { test(function serverResponseTimeout(cb) {
const server = http.createServer(common.mustCall(function(req, res) { const server = http.createServer(common.mustCall((req, res) => {
// just do nothing, we should get a timeout event. // just do nothing, we should get a timeout event.
const s = res.setTimeout(50, common.mustCall(function(socket) { const s = res.setTimeout(50, common.mustCall((socket) => {
socket.destroy(); socket.destroy();
server.close(); server.close();
cb(); cb();
})); }));
assert.ok(s instanceof http.OutgoingMessage); assert.ok(s instanceof http.OutgoingMessage);
})); }));
server.listen(common.mustCall(function() { server.listen(common.mustCall(() => {
http.get({ http.get({
port: server.address().port port: server.address().port
}).on('error', common.mustCall()); }).on('error', common.mustCall());
@ -97,18 +97,18 @@ test(function serverResponseTimeout(cb) {
}); });
test(function serverRequestNotTimeoutAfterEnd(cb) { test(function serverRequestNotTimeoutAfterEnd(cb) {
const server = http.createServer(common.mustCall(function(req, res) { const server = http.createServer(common.mustCall((req, res) => {
// just do nothing, we should get a timeout event. // just do nothing, we should get a timeout event.
const s = req.setTimeout(50, common.mustNotCall()); const s = req.setTimeout(50, common.mustNotCall());
assert.ok(s instanceof http.IncomingMessage); assert.ok(s instanceof http.IncomingMessage);
res.on('timeout', common.mustCall()); res.on('timeout', common.mustCall());
})); }));
server.on('timeout', common.mustCall(function(socket) { server.on('timeout', common.mustCall((socket) => {
socket.destroy(); socket.destroy();
server.close(); server.close();
cb(); cb();
})); }));
server.listen(common.mustCall(function() { server.listen(common.mustCall(() => {
http.get({ http.get({
port: server.address().port port: server.address().port
}).on('error', common.mustCall()); }).on('error', common.mustCall());
@ -118,31 +118,31 @@ test(function serverRequestNotTimeoutAfterEnd(cb) {
test(function serverResponseTimeoutWithPipeline(cb) { test(function serverResponseTimeoutWithPipeline(cb) {
let caughtTimeout = ''; let caughtTimeout = '';
let secReceived = false; let secReceived = false;
process.on('exit', function() { process.on('exit', () => {
assert.strictEqual(caughtTimeout, '/2'); assert.strictEqual(caughtTimeout, '/2');
}); });
const server = http.createServer(function(req, res) { const server = http.createServer((req, res) => {
if (req.url === '/2') if (req.url === '/2')
secReceived = true; secReceived = true;
const s = res.setTimeout(50, function() { const s = res.setTimeout(50, () => {
caughtTimeout += req.url; caughtTimeout += req.url;
}); });
assert.ok(s instanceof http.OutgoingMessage); assert.ok(s instanceof http.OutgoingMessage);
if (req.url === '/1') res.end(); if (req.url === '/1') res.end();
}); });
server.on('timeout', common.mustCall(function(socket) { server.on('timeout', common.mustCall((socket) => {
if (secReceived) { if (secReceived) {
socket.destroy(); socket.destroy();
server.close(); server.close();
cb(); cb();
} }
})); }));
server.listen(common.mustCall(function() { server.listen(common.mustCall(() => {
const options = { const options = {
port: server.address().port, port: server.address().port,
allowHalfOpen: true, allowHalfOpen: true,
}; };
const c = net.connect(options, function() { const c = net.connect(options, () => {
c.write('GET /1 HTTP/1.1\r\nHost: localhost\r\n\r\n'); c.write('GET /1 HTTP/1.1\r\nHost: localhost\r\n\r\n');
c.write('GET /2 HTTP/1.1\r\nHost: localhost\r\n\r\n'); c.write('GET /2 HTTP/1.1\r\nHost: localhost\r\n\r\n');
c.write('GET /3 HTTP/1.1\r\nHost: localhost\r\n\r\n'); c.write('GET /3 HTTP/1.1\r\nHost: localhost\r\n\r\n');
@ -151,23 +151,23 @@ test(function serverResponseTimeoutWithPipeline(cb) {
}); });
test(function idleTimeout(cb) { test(function idleTimeout(cb) {
const server = http.createServer(common.mustCall(function(req, res) { const server = http.createServer(common.mustCall((req, res) => {
req.on('timeout', common.mustNotCall()); req.on('timeout', common.mustNotCall());
res.on('timeout', common.mustNotCall()); res.on('timeout', common.mustNotCall());
res.end(); res.end();
})); }));
const s = server.setTimeout(50, common.mustCall(function(socket) { const s = server.setTimeout(50, common.mustCall((socket) => {
socket.destroy(); socket.destroy();
server.close(); server.close();
cb(); cb();
})); }));
assert.ok(s instanceof http.Server); assert.ok(s instanceof http.Server);
server.listen(common.mustCall(function() { server.listen(common.mustCall(() => {
const options = { const options = {
port: server.address().port, port: server.address().port,
allowHalfOpen: true, allowHalfOpen: true,
}; };
const c = net.connect(options, function() { const c = net.connect(options, () => {
c.write('GET /1 HTTP/1.1\r\nHost: localhost\r\n\r\n'); c.write('GET /1 HTTP/1.1\r\nHost: localhost\r\n\r\n');
// Keep-Alive // Keep-Alive
}); });

69
test/sequential/test-https-set-timeout-server.js
View File

@ -43,28 +43,24 @@ const serverOptions = {
function test(fn) { function test(fn) {
if (!tests.length) if (!tests.length)
process.nextTick(run); process.nextTick(run);
tests.push(fn); tests.push(common.mustCall(fn));
} }
function run() { function run() {
const fn = tests.shift(); const fn = tests.shift();
if (fn) { if (fn) {
console.log('# %s', fn.name);
fn(run); fn(run);
} else {
console.log('ok');
} }
} }
test(function serverTimeout(cb) { test(function serverTimeout(cb) {
const server = https.createServer( const server = https.createServer(
serverOptions, serverOptions,
common.mustCall(function(req, res) { common.mustCall((req, res) => {
// just do nothing, we should get a // just do nothing, we should get a timeout event.
// timeout event.
})); }));
server.listen(common.mustCall(function() { server.listen(common.mustCall(() => {
const s = server.setTimeout(50, common.mustCall(function(socket) { const s = server.setTimeout(50, common.mustCall((socket) => {
socket.destroy(); socket.destroy();
server.close(); server.close();
cb(); cb();
@ -80,19 +76,16 @@ test(function serverTimeout(cb) {
test(function serverRequestTimeout(cb) { test(function serverRequestTimeout(cb) {
const server = https.createServer( const server = https.createServer(
serverOptions, serverOptions,
common.mustCall(function(req, res) { common.mustCall((req, res) => {
// just do nothing, we should get a // just do nothing, we should get a timeout event.
// timeout event. const s = req.setTimeout(50, common.mustCall((socket) => {
const s = req.setTimeout( socket.destroy();
50, server.close();
common.mustCall(function(socket) { cb();
socket.destroy(); }));
server.close();
cb();
}));
assert.ok(s instanceof http.IncomingMessage); assert.ok(s instanceof http.IncomingMessage);
})); }));
server.listen(common.mustCall(function() { server.listen(common.mustCall(() => {
const req = https.request({ const req = https.request({
port: server.address().port, port: server.address().port,
method: 'POST', method: 'POST',
@ -107,16 +100,16 @@ test(function serverRequestTimeout(cb) {
test(function serverResponseTimeout(cb) { test(function serverResponseTimeout(cb) {
const server = https.createServer( const server = https.createServer(
serverOptions, serverOptions,
common.mustCall(function(req, res) { common.mustCall((req, res) => {
// just do nothing, we should get a timeout event. // just do nothing, we should get a timeout event.
const s = res.setTimeout(50, common.mustCall(function(socket) { const s = res.setTimeout(50, common.mustCall((socket) => {
socket.destroy(); socket.destroy();
server.close(); server.close();
cb(); cb();
})); }));
assert.ok(s instanceof http.OutgoingMessage); assert.ok(s instanceof http.OutgoingMessage);
})); }));
server.listen(common.mustCall(function() { server.listen(common.mustCall(() => {
https.get({ https.get({
port: server.address().port, port: server.address().port,
rejectUnauthorized: false rejectUnauthorized: false
@ -127,18 +120,18 @@ test(function serverResponseTimeout(cb) {
test(function serverRequestNotTimeoutAfterEnd(cb) { test(function serverRequestNotTimeoutAfterEnd(cb) {
const server = https.createServer( const server = https.createServer(
serverOptions, serverOptions,
common.mustCall(function(req, res) { common.mustCall((req, res) => {
// just do nothing, we should get a timeout event. // just do nothing, we should get a timeout event.
const s = req.setTimeout(50, common.mustNotCall()); const s = req.setTimeout(50, common.mustNotCall());
assert.ok(s instanceof http.IncomingMessage); assert.ok(s instanceof http.IncomingMessage);
res.on('timeout', common.mustCall()); res.on('timeout', common.mustCall());
})); }));
server.on('timeout', common.mustCall(function(socket) { server.on('timeout', common.mustCall((socket) => {
socket.destroy(); socket.destroy();
server.close(); server.close();
cb(); cb();
})); }));
server.listen(common.mustCall(function() { server.listen(common.mustCall(() => {
https.get({ https.get({
port: server.address().port, port: server.address().port,
rejectUnauthorized: false rejectUnauthorized: false
@ -149,32 +142,32 @@ test(function serverRequestNotTimeoutAfterEnd(cb) {
test(function serverResponseTimeoutWithPipeline(cb) { test(function serverResponseTimeoutWithPipeline(cb) {
let caughtTimeout = ''; let caughtTimeout = '';
let secReceived = false; let secReceived = false;
process.on('exit', function() { process.on('exit', () => {
assert.strictEqual(caughtTimeout, '/2'); assert.strictEqual(caughtTimeout, '/2');
}); });
const server = https.createServer(serverOptions, function(req, res) { const server = https.createServer(serverOptions, (req, res) => {
if (req.url === '/2') if (req.url === '/2')
secReceived = true; secReceived = true;
const s = res.setTimeout(50, function() { const s = res.setTimeout(50, () => {
caughtTimeout += req.url; caughtTimeout += req.url;
}); });
assert.ok(s instanceof http.OutgoingMessage); assert.ok(s instanceof http.OutgoingMessage);
if (req.url === '/1') res.end(); if (req.url === '/1') res.end();
}); });
server.on('timeout', function(socket) { server.on('timeout', common.mustCall((socket) => {
if (secReceived) { if (secReceived) {
socket.destroy(); socket.destroy();
server.close(); server.close();
cb(); cb();
} }
}); }));
server.listen(common.mustCall(function() { server.listen(common.mustCall(() => {
const options = { const options = {
port: server.address().port, port: server.address().port,
allowHalfOpen: true, allowHalfOpen: true,
rejectUnauthorized: false rejectUnauthorized: false
}; };
const c = tls.connect(options, function() { const c = tls.connect(options, () => {
c.write('GET /1 HTTP/1.1\r\nHost: localhost\r\n\r\n'); c.write('GET /1 HTTP/1.1\r\nHost: localhost\r\n\r\n');
c.write('GET /2 HTTP/1.1\r\nHost: localhost\r\n\r\n'); c.write('GET /2 HTTP/1.1\r\nHost: localhost\r\n\r\n');
c.write('GET /3 HTTP/1.1\r\nHost: localhost\r\n\r\n'); c.write('GET /3 HTTP/1.1\r\nHost: localhost\r\n\r\n');
@ -185,25 +178,25 @@ test(function serverResponseTimeoutWithPipeline(cb) {
test(function idleTimeout(cb) { test(function idleTimeout(cb) {
const server = https.createServer( const server = https.createServer(
serverOptions, serverOptions,
common.mustCall(function(req, res) { common.mustCall((req, res) => {
req.on('timeout', common.mustNotCall()); req.on('timeout', common.mustNotCall());
res.on('timeout', common.mustNotCall()); res.on('timeout', common.mustNotCall());
res.end(); res.end();
})); }));
const s = server.setTimeout(50, common.mustCall(function(socket) { const s = server.setTimeout(50, common.mustCall((socket) => {
socket.destroy(); socket.destroy();
server.close(); server.close();
cb(); cb();
})); }));
assert.ok(s instanceof https.Server); assert.ok(s instanceof https.Server);
server.listen(common.mustCall(function() { server.listen(common.mustCall(() => {
const options = { const options = {
port: server.address().port, port: server.address().port,
allowHalfOpen: true, allowHalfOpen: true,
rejectUnauthorized: false rejectUnauthorized: false
}; };
tls.connect(options, function() { const c = tls.connect(options, () => {
this.write('GET /1 HTTP/1.1\r\nHost: localhost\r\n\r\n'); c.write('GET /1 HTTP/1.1\r\nHost: localhost\r\n\r\n');
// Keep-Alive // Keep-Alive
}); });
})); }));