From b979502be08595ffdaf06566f0f640ac224f35b5 Mon Sep 17 00:00:00 2001 From: Sebastian Plesciuc Date: Wed, 26 Apr 2017 09:21:41 +0300 Subject: [PATCH] test: dynamic port in parallel regress tests Removed common.PORT from test-regress-GH-5051 and test-regress-GH-5727 in order to eliminate the possibility of port collision. Refs: https://github.com/nodejs/node/issues/12376 PR-URL: https://github.com/nodejs/node/pull/12639 Reviewed-By: Rich Trott Reviewed-By: Yuta Hiroto --- test/parallel/test-regress-GH-5051.js | 12 +++++++----- test/parallel/test-regress-GH-5727.js | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/test/parallel/test-regress-GH-5051.js b/test/parallel/test-regress-GH-5051.js index f2562bd7eb8020..ecaf55d625b815 100644 --- a/test/parallel/test-regress-GH-5051.js +++ b/test/parallel/test-regress-GH-5051.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +require('../common'); const assert = require('assert'); const agent = require('http').globalAgent; @@ -12,20 +12,22 @@ agent.maxSockets = 0; // localAddress is used when naming requests / sockets // while using the Legacy API -agent.addRequest(req, 'localhost', common.PORT, '127.0.0.1'); +// port 8080 is hardcoded since this does not create a network connection +agent.addRequest(req, 'localhost', 8080, '127.0.0.1'); assert.strictEqual(Object.keys(agent.requests).length, 1); assert.strictEqual( Object.keys(agent.requests)[0], - 'localhost:' + common.PORT + ':127.0.0.1'); + 'localhost:8080:127.0.0.1'); // path is *not* used when naming requests / sockets +// port 8080 is hardcoded since this does not create a network connection agent.addRequest(req, { host: 'localhost', - port: common.PORT, + port: 8080, localAddress: '127.0.0.1', path: '/foo' }); assert.strictEqual(Object.keys(agent.requests).length, 1); assert.strictEqual( Object.keys(agent.requests)[0], - 'localhost:' + common.PORT + ':127.0.0.1'); + 'localhost:8080:127.0.0.1'); diff --git a/test/parallel/test-regress-GH-5727.js b/test/parallel/test-regress-GH-5727.js index 8cbec2a178a5f7..7cedd831b2f783 100644 --- a/test/parallel/test-regress-GH-5727.js +++ b/test/parallel/test-regress-GH-5727.js @@ -6,9 +6,9 @@ const net = require('net'); const invalidPort = -1 >>> 0; const errorMessage = /"port" argument must be >= 0 and < 65536/; -net.Server().listen(common.PORT, function() { +net.Server().listen(0, function() { const address = this.address(); - const key = `${address.family.slice(-1)}:${address.address}:${common.PORT}`; + const key = `${address.family.slice(-1)}:${address.address}:0`; assert.strictEqual(this._connectionKey, key); this.close();