From 346f199e28efef4e6ab9d2c0afb3fe2e7403cd0c Mon Sep 17 00:00:00 2001 From: Alexey Orlenko Date: Mon, 26 Jun 2017 21:41:28 +0300 Subject: [PATCH] test: refactor test-http(s)-set-timeout-server * 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 Reviewed-By: Colin Ihrig Reviewed-By: Refael Ackermann Reviewed-By: Yuta Hiroto Reviewed-By: James M Snell --- test/parallel/test-http-set-timeout-server.js | 44 ++++++------ .../test-https-set-timeout-server.js | 69 +++++++++---------- 2 files changed, 53 insertions(+), 60 deletions(-) diff --git a/test/parallel/test-http-set-timeout-server.js b/test/parallel/test-http-set-timeout-server.js index 8c16ac922186bb..98072ab9c61b7e 100644 --- a/test/parallel/test-http-set-timeout-server.js +++ b/test/parallel/test-http-set-timeout-server.js @@ -21,11 +21,11 @@ function run() { } 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. })); - server.listen(common.mustCall(function() { - const s = server.setTimeout(50, common.mustCall(function(socket) { + server.listen(common.mustCall(() => { + const s = server.setTimeout(50, common.mustCall((socket) => { socket.destroy(); server.close(); cb(); @@ -38,16 +38,16 @@ test(function serverTimeout(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. - const s = req.setTimeout(50, common.mustCall(function(socket) { + const s = req.setTimeout(50, common.mustCall((socket) => { socket.destroy(); server.close(); cb(); })); assert.ok(s instanceof http.IncomingMessage); })); - server.listen(common.mustCall(function() { + server.listen(common.mustCall(() => { const req = http.request({ port: server.address().port, method: 'POST' @@ -59,16 +59,16 @@ test(function serverRequestTimeout(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. - const s = res.setTimeout(50, common.mustCall(function(socket) { + const s = res.setTimeout(50, common.mustCall((socket) => { socket.destroy(); server.close(); cb(); })); assert.ok(s instanceof http.OutgoingMessage); })); - server.listen(common.mustCall(function() { + server.listen(common.mustCall(() => { http.get({ port: server.address().port }).on('error', common.mustCall()); @@ -76,18 +76,18 @@ test(function serverResponseTimeout(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. const s = req.setTimeout(50, common.mustNotCall()); assert.ok(s instanceof http.IncomingMessage); res.on('timeout', common.mustCall()); })); - server.on('timeout', common.mustCall(function(socket) { + server.on('timeout', common.mustCall((socket) => { socket.destroy(); server.close(); cb(); })); - server.listen(common.mustCall(function() { + server.listen(common.mustCall(() => { http.get({ port: server.address().port }).on('error', common.mustCall()); @@ -97,31 +97,31 @@ test(function serverRequestNotTimeoutAfterEnd(cb) { test(function serverResponseTimeoutWithPipeline(cb) { let caughtTimeout = ''; let secReceived = false; - process.on('exit', function() { + process.on('exit', () => { assert.strictEqual(caughtTimeout, '/2'); }); - const server = http.createServer(function(req, res) { + const server = http.createServer((req, res) => { if (req.url === '/2') secReceived = true; - const s = res.setTimeout(50, function() { + const s = res.setTimeout(50, () => { caughtTimeout += req.url; }); assert.ok(s instanceof http.OutgoingMessage); if (req.url === '/1') res.end(); }); - server.on('timeout', common.mustCall(function(socket) { + server.on('timeout', common.mustCall((socket) => { if (secReceived) { socket.destroy(); server.close(); cb(); } })); - server.listen(common.mustCall(function() { + server.listen(common.mustCall(() => { const options = { port: server.address().port, 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 /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'); @@ -130,23 +130,23 @@ test(function serverResponseTimeoutWithPipeline(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()); res.on('timeout', common.mustNotCall()); res.end(); })); - const s = server.setTimeout(50, common.mustCall(function(socket) { + const s = server.setTimeout(50, common.mustCall((socket) => { socket.destroy(); server.close(); cb(); })); assert.ok(s instanceof http.Server); - server.listen(common.mustCall(function() { + server.listen(common.mustCall(() => { const options = { port: server.address().port, 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'); // Keep-Alive }); diff --git a/test/sequential/test-https-set-timeout-server.js b/test/sequential/test-https-set-timeout-server.js index a9467877d09a14..d2b44a0303da46 100644 --- a/test/sequential/test-https-set-timeout-server.js +++ b/test/sequential/test-https-set-timeout-server.js @@ -23,28 +23,24 @@ const serverOptions = { function test(fn) { if (!tests.length) process.nextTick(run); - tests.push(fn); + tests.push(common.mustCall(fn)); } function run() { const fn = tests.shift(); if (fn) { - console.log('# %s', fn.name); fn(run); - } else { - console.log('ok'); } } test(function serverTimeout(cb) { const server = https.createServer( serverOptions, - common.mustCall(function(req, res) { - // just do nothing, we should get a - // timeout event. + common.mustCall((req, res) => { + // just do nothing, we should get a timeout event. })); - server.listen(common.mustCall(function() { - const s = server.setTimeout(50, common.mustCall(function(socket) { + server.listen(common.mustCall(() => { + const s = server.setTimeout(50, common.mustCall((socket) => { socket.destroy(); server.close(); cb(); @@ -60,19 +56,16 @@ test(function serverTimeout(cb) { test(function serverRequestTimeout(cb) { const server = https.createServer( serverOptions, - common.mustCall(function(req, res) { - // just do nothing, we should get a - // timeout event. - const s = req.setTimeout( - 50, - common.mustCall(function(socket) { - socket.destroy(); - server.close(); - cb(); - })); + common.mustCall((req, res) => { + // just do nothing, we should get a timeout event. + const s = req.setTimeout(50, common.mustCall((socket) => { + socket.destroy(); + server.close(); + cb(); + })); assert.ok(s instanceof http.IncomingMessage); })); - server.listen(common.mustCall(function() { + server.listen(common.mustCall(() => { const req = https.request({ port: server.address().port, method: 'POST', @@ -87,16 +80,16 @@ test(function serverRequestTimeout(cb) { test(function serverResponseTimeout(cb) { const server = https.createServer( serverOptions, - common.mustCall(function(req, res) { + common.mustCall((req, res) => { // 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(); server.close(); cb(); })); assert.ok(s instanceof http.OutgoingMessage); })); - server.listen(common.mustCall(function() { + server.listen(common.mustCall(() => { https.get({ port: server.address().port, rejectUnauthorized: false @@ -107,18 +100,18 @@ test(function serverResponseTimeout(cb) { test(function serverRequestNotTimeoutAfterEnd(cb) { const server = https.createServer( serverOptions, - common.mustCall(function(req, res) { + common.mustCall((req, res) => { // just do nothing, we should get a timeout event. const s = req.setTimeout(50, common.mustNotCall()); assert.ok(s instanceof http.IncomingMessage); res.on('timeout', common.mustCall()); })); - server.on('timeout', common.mustCall(function(socket) { + server.on('timeout', common.mustCall((socket) => { socket.destroy(); server.close(); cb(); })); - server.listen(common.mustCall(function() { + server.listen(common.mustCall(() => { https.get({ port: server.address().port, rejectUnauthorized: false @@ -129,32 +122,32 @@ test(function serverRequestNotTimeoutAfterEnd(cb) { test(function serverResponseTimeoutWithPipeline(cb) { let caughtTimeout = ''; let secReceived = false; - process.on('exit', function() { + process.on('exit', () => { assert.strictEqual(caughtTimeout, '/2'); }); - const server = https.createServer(serverOptions, function(req, res) { + const server = https.createServer(serverOptions, (req, res) => { if (req.url === '/2') secReceived = true; - const s = res.setTimeout(50, function() { + const s = res.setTimeout(50, () => { caughtTimeout += req.url; }); assert.ok(s instanceof http.OutgoingMessage); if (req.url === '/1') res.end(); }); - server.on('timeout', function(socket) { + server.on('timeout', common.mustCall((socket) => { if (secReceived) { socket.destroy(); server.close(); cb(); } - }); - server.listen(common.mustCall(function() { + })); + server.listen(common.mustCall(() => { const options = { port: server.address().port, allowHalfOpen: true, 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 /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'); @@ -165,25 +158,25 @@ test(function serverResponseTimeoutWithPipeline(cb) { test(function idleTimeout(cb) { const server = https.createServer( serverOptions, - common.mustCall(function(req, res) { + common.mustCall((req, res) => { req.on('timeout', common.mustNotCall()); res.on('timeout', common.mustNotCall()); res.end(); })); - const s = server.setTimeout(50, common.mustCall(function(socket) { + const s = server.setTimeout(50, common.mustCall((socket) => { socket.destroy(); server.close(); cb(); })); assert.ok(s instanceof https.Server); - server.listen(common.mustCall(function() { + server.listen(common.mustCall(() => { const options = { port: server.address().port, allowHalfOpen: true, rejectUnauthorized: false }; - tls.connect(options, function() { - this.write('GET /1 HTTP/1.1\r\nHost: localhost\r\n\r\n'); + const c = tls.connect(options, () => { + c.write('GET /1 HTTP/1.1\r\nHost: localhost\r\n\r\n'); // Keep-Alive }); }));