Commit cde3014
test: remove modifcation to common.PORT
A possibly-buggy fixture server uses `common.PORT+1000` for its port
rather than `common.PORT`. That could result in it clashing with other
ports if tests are run in parallel. The test runner increments
`common.PORT` by 100 for each running instance for tests. Change to use
common.PORT and have the tests that use the fixture start with
common.PORT+1 for anything they need.
PR-URL: #6990
Refs: #6989
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>1 parent 1c65f1e commit cde3014
3 files changed
Lines changed: 3 additions & 3 deletions
File tree
- test
- fixtures/clustered-server
- parallel
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -31,5 +31,5 @@ if (cluster.isMaster) { | |||
| 31 | 31 | } | |
| 32 | 32 | } else { | |
| 33 | 33 | var server = http.createServer(handleRequest); | |
| 34 | - server.listen(common.PORT+1000); | ||
| 34 | + server.listen(common.PORT); | ||
| 35 | 35 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3,7 +3,7 @@ const common = require('../common'); | |||
| 3 | 3 | const assert = require('assert'); | |
| 4 | 4 | const spawn = require('child_process').spawn; | |
| 5 | 5 | ||
| 6 | - const PORT_MIN = common.PORT; | ||
| 6 | + const PORT_MIN = common.PORT + 1; // The fixture uses common.PORT. | ||
| 7 | 7 | const PORT_MAX = PORT_MIN + 2; | |
| 8 | 8 | ||
| 9 | 9 | const args = [ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3,7 +3,7 @@ var common = require('../common'); | |||
| 3 | 3 | var assert = require('assert'); | |
| 4 | 4 | var spawn = require('child_process').spawn; | |
| 5 | 5 | ||
| 6 | - var port = common.PORT + 42; | ||
| 6 | + var port = common.PORT + 1; // The fixture uses common.PORT. | ||
| 7 | 7 | var args = ['--debug-port=' + port, | |
| 8 | 8 | common.fixturesDir + '/clustered-server/app.js']; | |
| 9 | 9 | var options = { stdio: ['inherit', 'inherit', 'pipe', 'ipc'] }; | |
0 commit comments