-
Notifications
You must be signed in to change notification settings - Fork 29.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Instead of parsing execArgv, just adding --inspect-port with whatever debug port should be. Also exporting initial debug options to `process._debugOptions`, but needed it only in tests for now. parallel/test-cluster-inspector-debug-port.js deleted in favor of inspector/test-inspector-port-cluster.js Refs: #9659 (comment)
- Loading branch information
1 parent
af3aa68
commit 5e101d9
Showing
6 changed files
with
166 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,129 @@ | ||
'use strict'; | ||
|
||
const common = require('../common'); | ||
|
||
common.skipIfInspectorDisabled(); | ||
|
||
const assert = require('assert'); | ||
const cluster = require('cluster'); | ||
|
||
const debuggerPort = common.PORT; | ||
const childProcess = require('child_process'); | ||
|
||
let offset = 0; | ||
|
||
/* | ||
* This test suite checks that inspector port in cluster is incremented | ||
* for different execArgv combinations | ||
*/ | ||
|
||
function testRunnerMain() { | ||
spawnMaster({ | ||
execArgv: ['--inspect'], | ||
workers: [{expectedPort: 9230}] | ||
}); | ||
|
||
let port = debuggerPort + offset++ * 10; | ||
|
||
spawnMaster({ | ||
execArgv: [`--inspect=${port}`], | ||
workers: [ | ||
{expectedPort: port + 1}, | ||
{expectedPort: port + 2}, | ||
{expectedPort: port + 3} | ||
] | ||
}); | ||
|
||
port = debuggerPort + offset++ * 10; | ||
|
||
spawnMaster({ | ||
execArgv: ['--inspect', `--inspect-port=${port}`], | ||
workers: [{expectedPort: port + 1}] | ||
}); | ||
|
||
port = debuggerPort + offset++ * 10; | ||
|
||
spawnMaster({ | ||
execArgv: ['--inspect', `--debug-port=${port}`], | ||
workers: [{expectedPort: port + 1}] | ||
}); | ||
|
||
port = debuggerPort + offset++ * 10; | ||
|
||
spawnMaster({ | ||
execArgv: [`--inspect=0.0.0.0:${port}`], | ||
workers: [{expectedPort: port + 1, expectedHost: '0.0.0.0'}] | ||
}); | ||
|
||
port = debuggerPort + offset++ * 10; | ||
|
||
spawnMaster({ | ||
execArgv: [`--inspect=127.0.0.1:${port}`], | ||
workers: [{expectedPort: port + 1, expectedHost: '127.0.0.1'}] | ||
}); | ||
|
||
if (common.hasIPv6) { | ||
port = debuggerPort + offset++ * 10; | ||
|
||
spawnMaster({ | ||
execArgv: [`--inspect=[::]:${port}`], | ||
workers: [{expectedPort: port + 1, expectedHost: '::'}] | ||
}); | ||
|
||
port = debuggerPort + offset++ * 10; | ||
|
||
spawnMaster({ | ||
execArgv: [`--inspect=[::1]:${port}`], | ||
workers: [{expectedPort: port + 1, expectedHost: '::1'}] | ||
}); | ||
} | ||
} | ||
|
||
function masterProcessMain() { | ||
const workers = JSON.parse(process.env.workers); | ||
|
||
for (const worker of workers) { | ||
cluster.fork({ | ||
expectedPort: worker.expectedPort, | ||
expectedHost: worker.expectedHost | ||
}).on('exit', common.mustCall(checkExitCode)); | ||
} | ||
} | ||
|
||
function workerProcessMain() { | ||
const {expectedPort, expectedHost} = process.env; | ||
|
||
assert.strictEqual(process.debugPort, +expectedPort); | ||
|
||
if (expectedHost !== 'undefined') { | ||
assert.strictEqual( | ||
process.binding('config').debugOptions.host, | ||
expectedHost | ||
); | ||
} | ||
|
||
process.exit(); | ||
} | ||
|
||
function spawnMaster({execArgv, workers}) { | ||
childProcess.fork(__filename, { | ||
env: { | ||
workers: JSON.stringify(workers), | ||
testProcess: true | ||
}, | ||
execArgv | ||
}).on('exit', common.mustCall(checkExitCode)); | ||
} | ||
|
||
function checkExitCode(code, signal) { | ||
assert.strictEqual(code, 0); | ||
assert.strictEqual(signal, null); | ||
} | ||
|
||
if (!process.env.testProcess) { | ||
testRunnerMain(); | ||
} else if (cluster.isMaster) { | ||
masterProcessMain(); | ||
} else { | ||
workerProcessMain(); | ||
} |
This file was deleted.
Oops, something went wrong.