From 4514fd78f44a59b7687905b748712f12369ceb6a Mon Sep 17 00:00:00 2001 From: Adrian Estrada Date: Tue, 20 Dec 2016 19:00:10 -0500 Subject: [PATCH] test: refactor the code in test-http-keep-alive * use common.mustCall to control the functions execution automatically * use let and const instead of var * use assert.strictEqual instead assert.equal PR-URL: https://github.com/nodejs/node/pull/10350 Reviewed-By: Colin Ihrig Reviewed-By: Italo A. Casas --- test/parallel/test-http-keep-alive.js | 50 +++++++++++++-------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/test/parallel/test-http-keep-alive.js b/test/parallel/test-http-keep-alive.js index d48732e1161886..7f12e45765451d 100644 --- a/test/parallel/test-http-keep-alive.js +++ b/test/parallel/test-http-keep-alive.js @@ -1,51 +1,51 @@ 'use strict'; -require('../common'); -var assert = require('assert'); -var http = require('http'); +const common = require('../common'); +const assert = require('assert'); +const http = require('http'); -var body = 'hello world\n'; +const server = http.createServer(common.mustCall((req, res) => { + const body = 'hello world\n'; -var server = http.createServer(function(req, res) { res.writeHead(200, {'Content-Length': body.length}); res.write(body); res.end(); -}); +}, 3)); -var agent = new http.Agent({maxSockets: 1}); -var headers = {'connection': 'keep-alive'}; -var name; +const agent = new http.Agent({maxSockets: 1}); +const headers = {'connection': 'keep-alive'}; +let name; -server.listen(0, function() { +server.listen(0, common.mustCall(function() { name = agent.getName({ port: this.address().port }); http.get({ path: '/', headers: headers, port: this.address().port, agent: agent - }, function(response) { - assert.equal(agent.sockets[name].length, 1); - assert.equal(agent.requests[name].length, 2); + }, common.mustCall((response) => { + assert.strictEqual(agent.sockets[name].length, 1); + assert.strictEqual(agent.requests[name].length, 2); response.resume(); - }); + })); http.get({ path: '/', headers: headers, port: this.address().port, agent: agent - }, function(response) { - assert.equal(agent.sockets[name].length, 1); - assert.equal(agent.requests[name].length, 1); + }, common.mustCall((response) => { + assert.strictEqual(agent.sockets[name].length, 1); + assert.strictEqual(agent.requests[name].length, 1); response.resume(); - }); + })); http.get({ path: '/', headers: headers, port: this.address().port, agent: agent - }, function(response) { - response.on('end', function() { - assert.equal(agent.sockets[name].length, 1); + }, common.mustCall((response) => { + response.on('end', common.mustCall(() => { + assert.strictEqual(agent.sockets[name].length, 1); assert(!agent.requests.hasOwnProperty(name)); server.close(); - }); + })); response.resume(); - }); -}); + })); +})); -process.on('exit', function() { +process.on('exit', () => { assert(!agent.sockets.hasOwnProperty(name)); assert(!agent.requests.hasOwnProperty(name)); });