diff options
author | Julien Klepatch <julien@julienklepatch.com> | 2017-06-20 23:43:57 +0800 |
---|---|---|
committer | Alexey Orlenko <eaglexrlnk@gmail.com> | 2017-06-26 21:08:09 +0300 |
commit | 2e5ce2bc2c4b1abc48c514a668bb272484a59830 (patch) | |
tree | 1adf23a1aca397dc5e0f76c9217816d3d71b71ae /test/parallel/test-http-set-timeout-server.js | |
parent | 5fbbd25dc4133ed57f4904dfeee716a02e3817c9 (diff) | |
download | android-node-v8-2e5ce2bc2c4b1abc48c514a668bb272484a59830.tar.gz android-node-v8-2e5ce2bc2c4b1abc48c514a668bb272484a59830.tar.bz2 android-node-v8-2e5ce2bc2c4b1abc48c514a668bb272484a59830.zip |
test: make http(s)-set-timeout-server more similar
Make test-http(s)-set-timeout-server tests more similar and resolve the
following issues:
* `test-https-set-timeout-server.js` was missing some `assert`
statements, including with `http` module
* Both files were missing some calls to `common.mustCall()`
* Both files were calling `createServer()` in different ways
PR-URL: https://github.com/nodejs/node/pull/13822
Refs: https://github.com/nodejs/node/issues/13588
Refs: https://github.com/nodejs/node/pull/13625
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'test/parallel/test-http-set-timeout-server.js')
-rw-r--r-- | test/parallel/test-http-set-timeout-server.js | 74 |
1 files changed, 43 insertions, 31 deletions
diff --git a/test/parallel/test-http-set-timeout-server.js b/test/parallel/test-http-set-timeout-server.js index b1b9e98ac0..cd3cfa3bf1 100644 --- a/test/parallel/test-http-set-timeout-server.js +++ b/test/parallel/test-http-set-timeout-server.js @@ -42,22 +42,24 @@ function run() { } test(function serverTimeout(cb) { - const server = http.createServer(function(req, res) { + const server = http.createServer(common.mustCall(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.mustCall()); })); - const s = server.setTimeout(50, common.mustCall(function(socket) { - socket.destroy(); - server.close(); - cb(); + server.listen(common.mustCall(function() { + const s = server.setTimeout(50, common.mustCall(function(socket) { + socket.destroy(); + server.close(); + cb(); + })); + assert.ok(s instanceof http.Server); + http.get({ + port: server.address().port + }).on('error', common.mustCall()); })); - assert.ok(s instanceof http.Server); }); test(function serverRequestTimeout(cb) { - const server = http.createServer(function(req, res) { + const server = http.createServer(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(); @@ -65,10 +67,12 @@ test(function serverRequestTimeout(cb) { cb(); })); assert.ok(s instanceof http.IncomingMessage); - }); + })); server.listen(common.mustCall(function() { - const port = server.address().port; - const req = http.request({ port: port, method: 'POST' }); + const req = http.request({ + port: server.address().port, + method: 'POST' + }); req.on('error', common.mustCall()); req.write('Hello'); // req is in progress @@ -76,7 +80,7 @@ test(function serverRequestTimeout(cb) { }); test(function serverResponseTimeout(cb) { - const server = http.createServer(function(req, res) { + const server = http.createServer(common.mustCall(function(req, res) { // just do nothing, we should get a timeout event. const s = res.setTimeout(50, common.mustCall(function(socket) { socket.destroy(); @@ -84,28 +88,30 @@ test(function serverResponseTimeout(cb) { cb(); })); assert.ok(s instanceof http.OutgoingMessage); - }); + })); server.listen(common.mustCall(function() { - const port = server.address().port; - http.get({ port: port }).on('error', common.mustCall()); + http.get({ + port: server.address().port + }).on('error', common.mustCall()); })); }); test(function serverRequestNotTimeoutAfterEnd(cb) { - const server = http.createServer(function(req, res) { + const server = http.createServer(common.mustCall(function(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', function(socket) { + })); + server.on('timeout', common.mustCall(function(socket) { socket.destroy(); server.close(); cb(); - }); + })); server.listen(common.mustCall(function() { - const port = server.address().port; - http.get({ port: port }).on('error', common.mustCall()); + http.get({ + port: server.address().port + }).on('error', common.mustCall()); })); }); @@ -124,16 +130,19 @@ test(function serverResponseTimeoutWithPipeline(cb) { assert.ok(s instanceof http.OutgoingMessage); if (req.url === '/1') res.end(); }); - server.on('timeout', function(socket) { + server.on('timeout', common.mustCall(function(socket) { if (secReceived) { socket.destroy(); server.close(); cb(); } - }); + })); server.listen(common.mustCall(function() { - const port = server.address().port; - const c = net.connect({ port: port, allowHalfOpen: true }, function() { + const options = { + port: server.address().port, + allowHalfOpen: true, + }; + const c = net.connect(options, function() { 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'); @@ -142,11 +151,11 @@ test(function serverResponseTimeoutWithPipeline(cb) { }); test(function idleTimeout(cb) { - const server = http.createServer(function(req, res) { + const server = http.createServer(common.mustCall(function(req, res) { req.on('timeout', common.mustNotCall()); res.on('timeout', common.mustNotCall()); res.end(); - }); + })); const s = server.setTimeout(50, common.mustCall(function(socket) { socket.destroy(); server.close(); @@ -154,8 +163,11 @@ test(function idleTimeout(cb) { })); assert.ok(s instanceof http.Server); server.listen(common.mustCall(function() { - const port = server.address().port; - const c = net.connect({ port: port, allowHalfOpen: true }, function() { + const options = { + port: server.address().port, + allowHalfOpen: true, + }; + const c = net.connect(options, function() { c.write('GET /1 HTTP/1.1\r\nHost: localhost\r\n\r\n'); // Keep-Alive }); |