diff options
author | James M Snell <jasnell@gmail.com> | 2017-07-14 15:05:24 -0700 |
---|---|---|
committer | James M Snell <jasnell@gmail.com> | 2017-07-24 14:16:49 -0700 |
commit | b0a8a7c6baccea746da10e01bfb3dec18c0d723e (patch) | |
tree | 3bdf54ff6e3daa9c6ac9816914c7a51b892021dd /test/parallel/test-http-abort-queued.js | |
parent | ed21cb1774d3e146f84a94400db0008a940656c3 (diff) | |
download | android-node-v8-b0a8a7c6baccea746da10e01bfb3dec18c0d723e.tar.gz android-node-v8-b0a8a7c6baccea746da10e01bfb3dec18c0d723e.tar.bz2 android-node-v8-b0a8a7c6baccea746da10e01bfb3dec18c0d723e.zip |
test: improvements to various http tests
* Add common/countdown utility
* Numerous improvements to http tests
PR-URL: https://github.com/nodejs/node/pull/14315
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Diffstat (limited to 'test/parallel/test-http-abort-queued.js')
-rw-r--r-- | test/parallel/test-http-abort-queued.js | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/test/parallel/test-http-abort-queued.js b/test/parallel/test-http-abort-queued.js index 9b15fe2e74..224d0b606e 100644 --- a/test/parallel/test-http-abort-queued.js +++ b/test/parallel/test-http-abort-queued.js @@ -20,13 +20,13 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +const common = require('../common'); const assert = require('assert'); const http = require('http'); let complete; -const server = http.createServer(function(req, res) { +const server = http.createServer((req, res) => { // We should not see the queued /thatotherone request within the server // as it should be aborted before it is sent. assert.strictEqual(req.url, '/'); @@ -40,9 +40,7 @@ const server = http.createServer(function(req, res) { }); -server.listen(0, function() { - console.log('listen', server.address().port); - +server.listen(0, () => { const agent = new http.Agent({ maxSockets: 1 }); assert.strictEqual(Object.keys(agent.sockets).length, 0); @@ -55,7 +53,7 @@ server.listen(0, function() { }; const req1 = http.request(options); - req1.on('response', function(res1) { + req1.on('response', (res1) => { assert.strictEqual(Object.keys(agent.sockets).length, 1); assert.strictEqual(Object.keys(agent.requests).length, 0); @@ -69,7 +67,9 @@ server.listen(0, function() { assert.strictEqual(Object.keys(agent.sockets).length, 1); assert.strictEqual(Object.keys(agent.requests).length, 1); - req2.on('error', function(err) { + // TODO(jasnell): This event does not appear to currently be triggered. + // is this handler actually required? + req2.on('error', (err) => { // This is expected in response to our explicit abort call assert.strictEqual(err.code, 'ECONNRESET'); }); @@ -80,25 +80,16 @@ server.listen(0, function() { assert.strictEqual(Object.keys(agent.sockets).length, 1); assert.strictEqual(Object.keys(agent.requests).length, 1); - console.log(`Got res: ${res1.statusCode}`); - console.dir(res1.headers); - - res1.on('data', function(chunk) { - console.log(`Read ${chunk.length} bytes`); - console.log(' chunk=%j', chunk.toString()); - complete(); - }); + res1.on('data', (chunk) => complete()); - res1.on('end', function() { - console.log('Response ended.'); - - setTimeout(function() { + res1.on('end', common.mustCall(() => { + setTimeout(common.mustCall(() => { assert.strictEqual(Object.keys(agent.sockets).length, 0); assert.strictEqual(Object.keys(agent.requests).length, 0); server.close(); - }, 100); - }); + }), 100); + })); }); req1.end(); |