Skip to content

Commit 44228df

Browse files
TrottMyles Borins
authored and
Myles Borins
committed
test: remove common.PORT from gc tests
Allow the operating system to provide an arbitrary available port rather than using `common.PORT`, as `common.PORT` makes it likely that a test will fail with `EADDRINUSE` as a side effect of an earlier test. PR-URL: #7013 Reviewed-By: Brian White <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]>
1 parent 15bb0be commit 44228df

5 files changed

+15
-20
lines changed

test/gc/test-http-client-connaborted.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ function serverHandler(req, res) {
88

99
const http = require('http');
1010
const weak = require('weak');
11-
const common = require('../common');
11+
require('../common');
1212
const assert = require('assert');
13-
const PORT = common.PORT;
1413
const todo = 500;
1514
let done = 0;
1615
let count = 0;
@@ -19,7 +18,7 @@ let countGC = 0;
1918
console.log('We should do ' + todo + ' requests');
2019

2120
var server = http.createServer(serverHandler);
22-
server.listen(PORT, getall);
21+
server.listen(0, getall);
2322

2423
function getall() {
2524
if (count >= todo)
@@ -34,7 +33,7 @@ function getall() {
3433
var req = http.get({
3534
hostname: 'localhost',
3635
pathname: '/',
37-
port: PORT
36+
port: server.address().port
3837
}, cb).on('error', cb);
3938

4039
count++;

test/gc/test-http-client-onerror.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ function serverHandler(req, res) {
1010

1111
const http = require('http');
1212
const weak = require('weak');
13-
const common = require('../common');
13+
require('../common');
1414
const assert = require('assert');
15-
const PORT = common.PORT;
1615
const todo = 500;
1716
let done = 0;
1817
let count = 0;
@@ -21,7 +20,7 @@ let countGC = 0;
2120
console.log('We should do ' + todo + ' requests');
2221

2322
var server = http.createServer(serverHandler);
24-
server.listen(PORT, runTest);
23+
server.listen(0, runTest);
2524

2625
function getall() {
2726
if (count >= todo)
@@ -40,7 +39,7 @@ function getall() {
4039
var req = http.get({
4140
hostname: 'localhost',
4241
pathname: '/',
43-
port: PORT
42+
port: server.address().port
4443
}, cb).on('error', onerror);
4544

4645
count++;

test/gc/test-http-client-timeout.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ function serverHandler(req, res) {
1212

1313
const http = require('http');
1414
const weak = require('weak');
15-
const common = require('../common');
15+
require('../common');
1616
const assert = require('assert');
17-
const PORT = common.PORT;
1817
const todo = 550;
1918
let done = 0;
2019
let count = 0;
@@ -23,7 +22,7 @@ let countGC = 0;
2322
console.log('We should do ' + todo + ' requests');
2423

2524
var server = http.createServer(serverHandler);
26-
server.listen(PORT, getall);
25+
server.listen(0, getall);
2726

2827
function getall() {
2928
if (count >= todo)
@@ -39,7 +38,7 @@ function getall() {
3938
var req = http.get({
4039
hostname: 'localhost',
4140
pathname: '/',
42-
port: PORT
41+
port: server.address().port
4342
}, cb);
4443
req.on('error', cb);
4544
req.setTimeout(10, function() {

test/gc/test-http-client.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ function serverHandler(req, res) {
88

99
const http = require('http');
1010
const weak = require('weak');
11-
const common = require('../common');
11+
require('../common');
1212
const assert = require('assert');
13-
const PORT = common.PORT;
1413
const todo = 500;
1514
let done = 0;
1615
let count = 0;
@@ -19,7 +18,7 @@ let countGC = 0;
1918
console.log('We should do ' + todo + ' requests');
2019

2120
var server = http.createServer(serverHandler);
22-
server.listen(PORT, getall);
21+
server.listen(0, getall);
2322

2423

2524
function getall() {
@@ -37,7 +36,7 @@ function getall() {
3736
var req = http.get({
3837
hostname: 'localhost',
3938
pathname: '/',
40-
port: PORT
39+
port: server.address().port
4140
}, cb);
4241

4342
count++;

test/gc/test-net-timeout.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ function serverHandler(sock) {
1919

2020
const net = require('net');
2121
const weak = require('weak');
22-
const common = require('../common');
22+
require('../common');
2323
const assert = require('assert');
24-
const PORT = common.PORT;
2524
const todo = 500;
2625
let done = 0;
2726
let count = 0;
@@ -30,14 +29,14 @@ let countGC = 0;
3029
console.log('We should do ' + todo + ' requests');
3130

3231
var server = net.createServer(serverHandler);
33-
server.listen(PORT, getall);
32+
server.listen(0, getall);
3433

3534
function getall() {
3635
if (count >= todo)
3736
return;
3837

3938
(function() {
40-
var req = net.connect(PORT, '127.0.0.1');
39+
var req = net.connect(server.address().port, server.address().address);
4140
req.resume();
4241
req.setTimeout(10, function() {
4342
//console.log('timeout (expected)')

0 commit comments

Comments
 (0)