test: update test-http-timeout to use countdown

mithunsasidharan · maclover7 · commit 996bfccd17b7 · 2017-12-04T17:40:17.000-05:00
PR-URL: #17341 Reviewed-By: Jon Moss <me@jonathanmoss.me> Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
diff --git a/test/parallel/test-http-timeout.js b/test/parallel/test-http-timeout.js
@@ -23,36 +23,33 @@
 require('../common');
 
 const http = require('http');
+const Countdown = require('../common/countdown');
 
 const server = http.createServer(function(req, res){
 res.writeHead(200,{'Content-Type': 'text/plain' });
 res.end('OK');
 });
 
+const MAX_COUNT = 11;
 const agent = new http.Agent({maxSockets: 1 });
+const countdown = new Countdown(MAX_COUNT, () => server.close());
 
 server.listen(0, function(){
 
- for (let i = 0; i < 11; ++i){
+ for (let i = 0; i < MAX_COUNT; ++i){
 createRequest().end();
 }
 
 function callback(){}
 
- let count = 0;
-
 function createRequest(){
 const req = http.request(
{port: server.address().port, path: '/', agent: agent },
 function(res){
 req.clearTimeout(callback);
 
 res.on('end', function(){
- count++;
-
- if (count === 11){
- server.close();
- }
+ countdown.dec();
 });
 
 res.resume();

-Original file line number
+Diff line change
 require('../common');
 consthttp=require('http');
 +constCountdown=require('../common/countdown');
 constserver=http.createServer(function(req,res){
 res.writeHead(200,{'Content-Type': 'text/plain'});
 res.end('OK');
 });
 +constMAX_COUNT=11;
 constagent=newhttp.Agent({maxSockets: 1});
 +constcountdown=newCountdown(MAX_COUNT,()=>server.close());
 server.listen(0,function(){
 -for(leti=0;i<11;++i){
 +for(leti=0;i<MAX_COUNT;++i){
 createRequest().end();
+}
 functioncallback(){}
 -letcount=0;
+-
 functioncreateRequest(){
 constreq=http.request(
 {port: server.address().port,path: '/',agent: agent},
 function(res){
 req.clearTimeout(callback);
 res.on('end',function(){
 -count++;
+-
 -if(count===11){
 -server.close();
 -}
 +countdown.dec();
 });
 res.resume();