aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJoyee Cheung <joyeec9h3@gmail.com>2019-02-08 07:37:04 +0800
committerDaniel Bevenius <daniel.bevenius@gmail.com>2019-02-19 09:38:20 +0100
commitb200a46befd936cbf1b5356045d88ba9e8156e87 (patch)
treede7068e4e5eb68e97595d32e2b0473b53f19760d /test
parenta99316065d7e3dcb452d6f50da42c8f804600c9b (diff)
downloadandroid-node-v8-b200a46befd936cbf1b5356045d88ba9e8156e87.tar.gz
android-node-v8-b200a46befd936cbf1b5356045d88ba9e8156e87.tar.bz2
android-node-v8-b200a46befd936cbf1b5356045d88ba9e8156e87.zip
src: remove `process.binding('config').debugOptions`
`process.binding('config').debugOptions`, which contains the initial values of parsed debugger-related CLI options, has been used for internal testing. This patch removes them and uses `internal/options` to query the values in the tests instead. PR-URL: https://github.com/nodejs/node/pull/25999 Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'test')
-rw-r--r--test/sequential/test-inspector-port-cluster.js150
1 files changed, 78 insertions, 72 deletions
diff --git a/test/sequential/test-inspector-port-cluster.js b/test/sequential/test-inspector-port-cluster.js
index f7bebd926e..7b541eb156 100644
--- a/test/sequential/test-inspector-port-cluster.js
+++ b/test/sequential/test-inspector-port-cluster.js
@@ -1,5 +1,7 @@
'use strict';
+// Flags: --expose-internals
+
const common = require('../common');
common.skipIfInspectorDisabled();
@@ -205,7 +207,7 @@ function testRunnerMain() {
}
function masterProcessMain() {
const workers = JSON.parse(process.env.workers);
- const clusterSettings = JSON.parse(process.env.clusterSettings);
+ const clusterSettings = JSON.parse(process.env.clusterSettings) || {};
const badPortError = { type: RangeError, code: 'ERR_SOCKET_BAD_PORT' };
let debugPort = process.debugPort;
@@ -224,85 +226,89 @@ function masterProcessMain() {
params.expectedHost = worker.expectedHost;
}
- if (clusterSettings) {
- if (clusterSettings.inspectPort === 'addTwo') {
- clusterSettings.inspectPort = common.mustCall(
- () => { return debugPort += 2; },
- workers.length
- );
- } else if (clusterSettings.inspectPort === 'string') {
- clusterSettings.inspectPort = 'string';
- cluster.setupMaster(clusterSettings);
-
- common.expectsError(() => {
- cluster.fork(params).on('exit', common.mustCall(checkExitCode));
- }, badPortError);
-
- return;
- } else if (clusterSettings.inspectPort === 'null') {
- clusterSettings.inspectPort = null;
- cluster.setupMaster(clusterSettings);
-
- common.expectsError(() => {
- cluster.fork(params).on('exit', common.mustCall(checkExitCode));
- }, badPortError);
-
- return;
- } else if (clusterSettings.inspectPort === 'bignumber') {
- clusterSettings.inspectPort = 1293812;
- cluster.setupMaster(clusterSettings);
-
- common.expectsError(() => {
- cluster.fork(params).on('exit', common.mustCall(checkExitCode));
- }, badPortError);
-
- return;
- } else if (clusterSettings.inspectPort === 'negativenumber') {
- clusterSettings.inspectPort = -9776;
- cluster.setupMaster(clusterSettings);
-
- common.expectsError(() => {
- cluster.fork(params).on('exit', common.mustCall(checkExitCode));
- }, badPortError);
-
- return;
- } else if (clusterSettings.inspectPort === 'bignumberfunc') {
- clusterSettings.inspectPort = common.mustCall(
- () => 123121,
- workers.length
- );
-
- cluster.setupMaster(clusterSettings);
-
- common.expectsError(() => {
- cluster.fork(params).on('exit', common.mustCall(checkExitCode));
- }, badPortError);
-
- return;
- } else if (clusterSettings.inspectPort === 'strfunc') {
- clusterSettings.inspectPort = common.mustCall(
- () => 'invalidPort',
- workers.length
- );
-
- cluster.setupMaster(clusterSettings);
-
- common.expectsError(() => {
- cluster.fork(params).on('exit', common.mustCall(checkExitCode));
- }, badPortError);
-
- return;
- }
+ clusterSettings.execArgv = clusterSettings.execArgv ?
+ clusterSettings.execArgv.concat(['--expose-internals']) :
+ process.execArgv.concat(['--expose-internals']);
+
+ if (clusterSettings.inspectPort === 'addTwo') {
+ clusterSettings.inspectPort = common.mustCall(
+ () => { return debugPort += 2; },
+ workers.length
+ );
+ } else if (clusterSettings.inspectPort === 'string') {
+ clusterSettings.inspectPort = 'string';
+ cluster.setupMaster(clusterSettings);
+
+ common.expectsError(() => {
+ cluster.fork(params).on('exit', common.mustCall(checkExitCode));
+ }, badPortError);
+
+ return;
+ } else if (clusterSettings.inspectPort === 'null') {
+ clusterSettings.inspectPort = null;
cluster.setupMaster(clusterSettings);
+
+ common.expectsError(() => {
+ cluster.fork(params).on('exit', common.mustCall(checkExitCode));
+ }, badPortError);
+
+ return;
+ } else if (clusterSettings.inspectPort === 'bignumber') {
+ clusterSettings.inspectPort = 1293812;
+ cluster.setupMaster(clusterSettings);
+
+ common.expectsError(() => {
+ cluster.fork(params).on('exit', common.mustCall(checkExitCode));
+ }, badPortError);
+
+ return;
+ } else if (clusterSettings.inspectPort === 'negativenumber') {
+ clusterSettings.inspectPort = -9776;
+ cluster.setupMaster(clusterSettings);
+
+ common.expectsError(() => {
+ cluster.fork(params).on('exit', common.mustCall(checkExitCode));
+ }, badPortError);
+
+ return;
+ } else if (clusterSettings.inspectPort === 'bignumberfunc') {
+ clusterSettings.inspectPort = common.mustCall(
+ () => 123121,
+ workers.length
+ );
+
+ cluster.setupMaster(clusterSettings);
+
+ common.expectsError(() => {
+ cluster.fork(params).on('exit', common.mustCall(checkExitCode));
+ }, badPortError);
+
+ return;
+ } else if (clusterSettings.inspectPort === 'strfunc') {
+ clusterSettings.inspectPort = common.mustCall(
+ () => 'invalidPort',
+ workers.length
+ );
+
+ cluster.setupMaster(clusterSettings);
+
+ common.expectsError(() => {
+ cluster.fork(params).on('exit', common.mustCall(checkExitCode));
+ }, badPortError);
+
+ return;
}
+ cluster.setupMaster(clusterSettings);
+
cluster.fork(params).on('exit', common.mustCall(checkExitCode));
}
}
function workerProcessMain() {
const { expectedPort, expectedInitialPort, expectedHost } = process.env;
- const debugOptions = process.binding('config').debugOptions;
+ const debugOptions =
+ require('internal/options').getOptionValue('--inspect-port');
if ('expectedPort' in process.env) {
assert.strictEqual(process.debugPort, +expectedPort);
@@ -327,7 +333,7 @@ function spawnMaster({ execArgv, workers, clusterSettings = {} }) {
clusterSettings: JSON.stringify(clusterSettings),
testProcess: true
}),
- execArgv
+ execArgv: execArgv.concat(['--expose-internals'])
}).on('exit', common.mustCall((code, signal) => {
checkExitCode(code, signal);
resolve();