Browse Source

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: https://github.com/nodejs/node/pull/7013
Reviewed-By: Brian White <mscdex@mscdex.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
v7.x
Rich Trott 9 years ago
parent
commit
3b8e342278
  1. 7
      test/gc/test-http-client-connaborted.js
  2. 7
      test/gc/test-http-client-onerror.js
  3. 7
      test/gc/test-http-client-timeout.js
  4. 7
      test/gc/test-http-client.js
  5. 7
      test/gc/test-net-timeout.js

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

@ -8,9 +8,8 @@ function serverHandler(req, res) {
const http = require('http'); const http = require('http');
const weak = require('weak'); const weak = require('weak');
const common = require('../common'); require('../common');
const assert = require('assert'); const assert = require('assert');
const PORT = common.PORT;
const todo = 500; const todo = 500;
let done = 0; let done = 0;
let count = 0; let count = 0;
@ -19,7 +18,7 @@ let countGC = 0;
console.log('We should do ' + todo + ' requests'); console.log('We should do ' + todo + ' requests');
var server = http.createServer(serverHandler); var server = http.createServer(serverHandler);
server.listen(PORT, getall); server.listen(0, getall);
function getall() { function getall() {
if (count >= todo) if (count >= todo)
@ -34,7 +33,7 @@ function getall() {
var req = http.get({ var req = http.get({
hostname: 'localhost', hostname: 'localhost',
pathname: '/', pathname: '/',
port: PORT port: server.address().port
}, cb).on('error', cb); }, cb).on('error', cb);
count++; count++;

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

@ -10,9 +10,8 @@ function serverHandler(req, res) {
const http = require('http'); const http = require('http');
const weak = require('weak'); const weak = require('weak');
const common = require('../common'); require('../common');
const assert = require('assert'); const assert = require('assert');
const PORT = common.PORT;
const todo = 500; const todo = 500;
let done = 0; let done = 0;
let count = 0; let count = 0;
@ -21,7 +20,7 @@ let countGC = 0;
console.log('We should do ' + todo + ' requests'); console.log('We should do ' + todo + ' requests');
var server = http.createServer(serverHandler); var server = http.createServer(serverHandler);
server.listen(PORT, runTest); server.listen(0, runTest);
function getall() { function getall() {
if (count >= todo) if (count >= todo)
@ -40,7 +39,7 @@ function getall() {
var req = http.get({ var req = http.get({
hostname: 'localhost', hostname: 'localhost',
pathname: '/', pathname: '/',
port: PORT port: server.address().port
}, cb).on('error', onerror); }, cb).on('error', onerror);
count++; count++;

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

@ -12,9 +12,8 @@ function serverHandler(req, res) {
const http = require('http'); const http = require('http');
const weak = require('weak'); const weak = require('weak');
const common = require('../common'); require('../common');
const assert = require('assert'); const assert = require('assert');
const PORT = common.PORT;
const todo = 550; const todo = 550;
let done = 0; let done = 0;
let count = 0; let count = 0;
@ -23,7 +22,7 @@ let countGC = 0;
console.log('We should do ' + todo + ' requests'); console.log('We should do ' + todo + ' requests');
var server = http.createServer(serverHandler); var server = http.createServer(serverHandler);
server.listen(PORT, getall); server.listen(0, getall);
function getall() { function getall() {
if (count >= todo) if (count >= todo)
@ -39,7 +38,7 @@ function getall() {
var req = http.get({ var req = http.get({
hostname: 'localhost', hostname: 'localhost',
pathname: '/', pathname: '/',
port: PORT port: server.address().port
}, cb); }, cb);
req.on('error', cb); req.on('error', cb);
req.setTimeout(10, function() { req.setTimeout(10, function() {

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

@ -8,9 +8,8 @@ function serverHandler(req, res) {
const http = require('http'); const http = require('http');
const weak = require('weak'); const weak = require('weak');
const common = require('../common'); require('../common');
const assert = require('assert'); const assert = require('assert');
const PORT = common.PORT;
const todo = 500; const todo = 500;
let done = 0; let done = 0;
let count = 0; let count = 0;
@ -19,7 +18,7 @@ let countGC = 0;
console.log('We should do ' + todo + ' requests'); console.log('We should do ' + todo + ' requests');
var server = http.createServer(serverHandler); var server = http.createServer(serverHandler);
server.listen(PORT, getall); server.listen(0, getall);
function getall() { function getall() {
@ -37,7 +36,7 @@ function getall() {
var req = http.get({ var req = http.get({
hostname: 'localhost', hostname: 'localhost',
pathname: '/', pathname: '/',
port: PORT port: server.address().port
}, cb); }, cb);
count++; count++;

7
test/gc/test-net-timeout.js

@ -19,9 +19,8 @@ function serverHandler(sock) {
const net = require('net'); const net = require('net');
const weak = require('weak'); const weak = require('weak');
const common = require('../common'); require('../common');
const assert = require('assert'); const assert = require('assert');
const PORT = common.PORT;
const todo = 500; const todo = 500;
let done = 0; let done = 0;
let count = 0; let count = 0;
@ -30,14 +29,14 @@ let countGC = 0;
console.log('We should do ' + todo + ' requests'); console.log('We should do ' + todo + ' requests');
var server = net.createServer(serverHandler); var server = net.createServer(serverHandler);
server.listen(PORT, getall); server.listen(0, getall);
function getall() { function getall() {
if (count >= todo) if (count >= todo)
return; return;
(function() { (function() {
var req = net.connect(PORT, '127.0.0.1'); var req = net.connect(server.address().port, server.address().address);
req.resume(); req.resume();
req.setTimeout(10, function() { req.setTimeout(10, function() {
//console.log('timeout (expected)') //console.log('timeout (expected)')

Loading…
Cancel
Save