test: update test-http-upgrade-client to use countdown

mithunsasidharan · gibfahn · commit 6723619a0792 · 2017-12-20T01:59:39.000Z
PR-URL: #17339 Reviewed-By: Jon Moss <me@jonathanmoss.me> Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
diff --git a/test/parallel/test-http-upgrade-client.js b/test/parallel/test-http-upgrade-client.js
@@ -29,6 +29,7 @@ const assert = require('assert');
 
 const http = require('http');
 const net = require('net');
+const Countdown = require('../common/countdown');
 
 // Create a TCP server
 const srv = net.createServer(function(c){
@@ -60,7 +61,8 @@ srv.listen(0, '127.0.0.1', common.mustCall(function(){
 ['Origin', 'http://www.websocket.org']
 ]
 ];
- let left = headers.length;
+ const countdown = new Countdown(headers.length, () => srv.close());
+
 headers.forEach(function(h){
 const req = http.get({
 port: port,
@@ -87,8 +89,7 @@ srv.listen(0, '127.0.0.1', common.mustCall(function(){
 assert.deepStrictEqual(expectedHeaders, res.headers);
 
 socket.end();
- if (--left === 0)
- srv.close();
+ countdown.dec();
 }));
 req.on('close', common.mustCall(function(){
 assert.strictEqual(sawUpgrade, true);

-Original file line number
+Diff line change
 consthttp=require('http');
 constnet=require('net');
 +constCountdown=require('../common/countdown');
 // Create a TCP server
 constsrv=net.createServer(function(c){
 ['Origin','http://www.websocket.org']
+]
 ];
 -letleft=headers.length;
 +constcountdown=newCountdown(headers.length,()=>srv.close());
++
 headers.forEach(function(h){
 constreq=http.get({
 port: port,
 assert.deepStrictEqual(expectedHeaders,res.headers);
 socket.end();
 -if(--left===0)
 -srv.close();
 +countdown.dec();
 }));
 req.on('close',common.mustCall(function(){
 assert.strictEqual(sawUpgrade,true);