diff options
author | Rich Trott <rtrott@gmail.com> | 2016-05-26 20:49:51 -0700 |
---|---|---|
committer | Rich Trott <rtrott@gmail.com> | 2016-05-31 16:03:10 -0700 |
commit | 3b8e3422780945e658f6f43c8cb32191f0766e57 (patch) | |
tree | 737d2714fa7547851b8c4e711cdf373c154478d5 /test/gc | |
parent | ef9a8fa35b1755d53da0eba5b4a768f14f084eff (diff) | |
download | android-node-v8-3b8e3422780945e658f6f43c8cb32191f0766e57.tar.gz android-node-v8-3b8e3422780945e658f6f43c8cb32191f0766e57.tar.bz2 android-node-v8-3b8e3422780945e658f6f43c8cb32191f0766e57.zip |
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>
Diffstat (limited to 'test/gc')
-rw-r--r-- | test/gc/test-http-client-connaborted.js | 7 | ||||
-rw-r--r-- | test/gc/test-http-client-onerror.js | 7 | ||||
-rw-r--r-- | test/gc/test-http-client-timeout.js | 7 | ||||
-rw-r--r-- | test/gc/test-http-client.js | 7 | ||||
-rw-r--r-- | test/gc/test-net-timeout.js | 7 |
5 files changed, 15 insertions, 20 deletions
diff --git a/test/gc/test-http-client-connaborted.js b/test/gc/test-http-client-connaborted.js index 8e9da96e50..ec8af1472d 100644 --- a/test/gc/test-http-client-connaborted.js +++ b/test/gc/test-http-client-connaborted.js @@ -8,9 +8,8 @@ function serverHandler(req, res) { const http = require('http'); const weak = require('weak'); -const common = require('../common'); +require('../common'); const assert = require('assert'); -const PORT = common.PORT; const todo = 500; let done = 0; let count = 0; @@ -19,7 +18,7 @@ let countGC = 0; console.log('We should do ' + todo + ' requests'); var server = http.createServer(serverHandler); -server.listen(PORT, getall); +server.listen(0, getall); function getall() { if (count >= todo) @@ -34,7 +33,7 @@ function getall() { var req = http.get({ hostname: 'localhost', pathname: '/', - port: PORT + port: server.address().port }, cb).on('error', cb); count++; diff --git a/test/gc/test-http-client-onerror.js b/test/gc/test-http-client-onerror.js index 0dc07691d4..3746926c2b 100644 --- a/test/gc/test-http-client-onerror.js +++ b/test/gc/test-http-client-onerror.js @@ -10,9 +10,8 @@ function serverHandler(req, res) { const http = require('http'); const weak = require('weak'); -const common = require('../common'); +require('../common'); const assert = require('assert'); -const PORT = common.PORT; const todo = 500; let done = 0; let count = 0; @@ -21,7 +20,7 @@ let countGC = 0; console.log('We should do ' + todo + ' requests'); var server = http.createServer(serverHandler); -server.listen(PORT, runTest); +server.listen(0, runTest); function getall() { if (count >= todo) @@ -40,7 +39,7 @@ function getall() { var req = http.get({ hostname: 'localhost', pathname: '/', - port: PORT + port: server.address().port }, cb).on('error', onerror); count++; diff --git a/test/gc/test-http-client-timeout.js b/test/gc/test-http-client-timeout.js index ef930a9d60..7b65e7ccb9 100644 --- a/test/gc/test-http-client-timeout.js +++ b/test/gc/test-http-client-timeout.js @@ -12,9 +12,8 @@ function serverHandler(req, res) { const http = require('http'); const weak = require('weak'); -const common = require('../common'); +require('../common'); const assert = require('assert'); -const PORT = common.PORT; const todo = 550; let done = 0; let count = 0; @@ -23,7 +22,7 @@ let countGC = 0; console.log('We should do ' + todo + ' requests'); var server = http.createServer(serverHandler); -server.listen(PORT, getall); +server.listen(0, getall); function getall() { if (count >= todo) @@ -39,7 +38,7 @@ function getall() { var req = http.get({ hostname: 'localhost', pathname: '/', - port: PORT + port: server.address().port }, cb); req.on('error', cb); req.setTimeout(10, function() { diff --git a/test/gc/test-http-client.js b/test/gc/test-http-client.js index 6f5d8b2d90..8301caa861 100644 --- a/test/gc/test-http-client.js +++ b/test/gc/test-http-client.js @@ -8,9 +8,8 @@ function serverHandler(req, res) { const http = require('http'); const weak = require('weak'); -const common = require('../common'); +require('../common'); const assert = require('assert'); -const PORT = common.PORT; const todo = 500; let done = 0; let count = 0; @@ -19,7 +18,7 @@ let countGC = 0; console.log('We should do ' + todo + ' requests'); var server = http.createServer(serverHandler); -server.listen(PORT, getall); +server.listen(0, getall); function getall() { @@ -37,7 +36,7 @@ function getall() { var req = http.get({ hostname: 'localhost', pathname: '/', - port: PORT + port: server.address().port }, cb); count++; diff --git a/test/gc/test-net-timeout.js b/test/gc/test-net-timeout.js index 62080b68dc..ff1d5656ce 100644 --- a/test/gc/test-net-timeout.js +++ b/test/gc/test-net-timeout.js @@ -19,9 +19,8 @@ function serverHandler(sock) { const net = require('net'); const weak = require('weak'); -const common = require('../common'); +require('../common'); const assert = require('assert'); -const PORT = common.PORT; const todo = 500; let done = 0; let count = 0; @@ -30,14 +29,14 @@ let countGC = 0; console.log('We should do ' + todo + ' requests'); var server = net.createServer(serverHandler); -server.listen(PORT, getall); +server.listen(0, getall); function getall() { if (count >= todo) return; (function() { - var req = net.connect(PORT, '127.0.0.1'); + var req = net.connect(server.address().port, server.address().address); req.resume(); req.setTimeout(10, function() { //console.log('timeout (expected)') |