From 3ef1c59cebc1c1697a1411ab5124db00d13ee22d Mon Sep 17 00:00:00 2001 From: Shilo Mangam Date: Wed, 6 Dec 2017 20:36:28 +0200 Subject: [PATCH 1/4] adding Countdown to test-http-set-cookies test --- test/parallel/test-http-set-cookies.js | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/test/parallel/test-http-set-cookies.js b/test/parallel/test-http-set-cookies.js index 44a5f47bbb3d03..9ed1ec9c5ec1a6 100644 --- a/test/parallel/test-http-set-cookies.js +++ b/test/parallel/test-http-set-cookies.js @@ -20,21 +20,21 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +const common = require('../common'); const assert = require('assert'); const http = require('http'); +const Countdown = require('../common/countdown'); -let nresponses = 0; - +const countdown = new Countdown(2, common.mustCall(() => server.close())); const server = http.createServer(function(req, res) { if (req.url === '/one') { res.writeHead(200, [['set-cookie', 'A'], - ['content-type', 'text/plain']]); + ['content-type', 'text/plain']]); res.end('one\n'); } else { res.writeHead(200, [['set-cookie', 'A'], - ['set-cookie', 'B'], - ['content-type', 'text/plain']]); + ['set-cookie', 'B'], + ['content-type', 'text/plain']]); res.end('two\n'); } }); @@ -44,7 +44,7 @@ server.on('listening', function() { // // one set-cookie header // - http.get({ port: this.address().port, path: '/one' }, function(res) { + http.get({port: this.address().port, path: '/one'}, function(res) { // set-cookie headers are always return in an array. // even if there is only one. assert.deepStrictEqual(['A'], res.headers['set-cookie']); @@ -55,15 +55,13 @@ server.on('listening', function() { }); res.on('end', function() { - if (++nresponses === 2) { - server.close(); - } + countdown.dec(); }); }); // two set-cookie headers - http.get({ port: this.address().port, path: '/two' }, function(res) { + http.get({port: this.address().port, path: '/two'}, function(res) { assert.deepStrictEqual(['A', 'B'], res.headers['set-cookie']); assert.strictEqual('text/plain', res.headers['content-type']); @@ -72,14 +70,12 @@ server.on('listening', function() { }); res.on('end', function() { - if (++nresponses === 2) { - server.close(); - } + countdown.dec(); }); }); }); process.on('exit', function() { - assert.strictEqual(2, nresponses); + assert.strictEqual(countdown.remaining, 0); }); From f855134617b42c67635363b2c66e39e22cd25ed8 Mon Sep 17 00:00:00 2001 From: Shilo Mangam Date: Wed, 6 Dec 2017 20:36:28 +0200 Subject: [PATCH 2/4] adding Countdown to test-http-set-cookies test --- test/parallel/test-http-set-cookies.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/test/parallel/test-http-set-cookies.js b/test/parallel/test-http-set-cookies.js index 9ed1ec9c5ec1a6..00cb31e83ebf25 100644 --- a/test/parallel/test-http-set-cookies.js +++ b/test/parallel/test-http-set-cookies.js @@ -29,12 +29,12 @@ const countdown = new Countdown(2, common.mustCall(() => server.close())); const server = http.createServer(function(req, res) { if (req.url === '/one') { res.writeHead(200, [['set-cookie', 'A'], - ['content-type', 'text/plain']]); + ['content-type', 'text/plain']]); res.end('one\n'); } else { res.writeHead(200, [['set-cookie', 'A'], - ['set-cookie', 'B'], - ['content-type', 'text/plain']]); + ['set-cookie', 'B'], + ['content-type', 'text/plain']]); res.end('two\n'); } }); @@ -44,7 +44,7 @@ server.on('listening', function() { // // one set-cookie header // - http.get({port: this.address().port, path: '/one'}, function(res) { + http.get({ port: this.address().port, path: '/one' }, function(res) { // set-cookie headers are always return in an array. // even if there is only one. assert.deepStrictEqual(['A'], res.headers['set-cookie']); @@ -61,7 +61,7 @@ server.on('listening', function() { // two set-cookie headers - http.get({port: this.address().port, path: '/two'}, function(res) { + http.get({ port: this.address().port, path: '/two' }, function(res) { assert.deepStrictEqual(['A', 'B'], res.headers['set-cookie']); assert.strictEqual('text/plain', res.headers['content-type']); @@ -76,6 +76,3 @@ server.on('listening', function() { }); -process.on('exit', function() { - assert.strictEqual(countdown.remaining, 0); -}); From 2676d7c599b83ea2604c743a48e87bfee12f3dec Mon Sep 17 00:00:00 2001 From: Shilo Mangam Date: Wed, 6 Dec 2017 20:36:28 +0200 Subject: [PATCH 3/4] adding Countdown to test-http-set-cookies test --- test/parallel/test-http-set-cookies.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-http-set-cookies.js b/test/parallel/test-http-set-cookies.js index 00cb31e83ebf25..4146de723ecd11 100644 --- a/test/parallel/test-http-set-cookies.js +++ b/test/parallel/test-http-set-cookies.js @@ -20,12 +20,12 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +require('../common'); const assert = require('assert'); const http = require('http'); const Countdown = require('../common/countdown'); -const countdown = new Countdown(2, common.mustCall(() => server.close())); +const countdown = new Countdown(2, () => server.close()); const server = http.createServer(function(req, res) { if (req.url === '/one') { res.writeHead(200, [['set-cookie', 'A'], From 39f8099a78b89e646c23bb86b003c76b20d43154 Mon Sep 17 00:00:00 2001 From: Shilo Mangam Date: Wed, 6 Dec 2017 20:36:28 +0200 Subject: [PATCH 4/4] adding Countdown to test-http-set-cookies test --- test/parallel/test-http-set-cookies.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/parallel/test-http-set-cookies.js b/test/parallel/test-http-set-cookies.js index 4146de723ecd11..c307bda73a3515 100644 --- a/test/parallel/test-http-set-cookies.js +++ b/test/parallel/test-http-set-cookies.js @@ -75,4 +75,3 @@ server.on('listening', function() { }); }); -