Skip to content

test_runner: remove problematic uses of parseCommandLine() #54353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cjihrig wants to merge 6 commits into from
Closed

test_runner: remove problematic uses of parseCommandLine() #54353

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
73e0f81
test_runner: use run() argument names in parseCommandLine()
cjihrig Aug 7, 2024
488e5bc
test_runner: pass harness object as option to root test
cjihrig Aug 8, 2024
cc2ba8c
test_runner: pass global options to createTestTree()
cjihrig Aug 12, 2024
2d41819
test_runner: return setup() from parseCommandLine()
cjihrig Aug 13, 2024
3ad749c
test_runner: refactor hook creation
cjihrig Aug 13, 2024
44bfa3b
test_runner: remove parseCommandLine() from test.js
cjihrig Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
test_runner: use run() argument names in parseCommandLine() 
This commit updates parseCommandLine() to use the names supported
by run(). This removes some unnecessary renaming code, and allows
node:test and run() to more easily share code.
  • Loading branch information
@cjihrig
cjihrig committed Aug 13, 2024
commit 73e0f817b99f8499c7ff6234d0dcc5668fdbabed
26 changes: 6 additions & 20 deletions lib/internal/main/test_runner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,18 @@ let debug = require('internal/util/debuglog').debuglog('test_runner', (fn) => {
prepareMainThreadExecution(false);
markBootstrapComplete();

const {
perFileTimeout,
runnerConcurrency,
shard,
watchMode,
} = parseCommandLine();

let concurrency = runnerConcurrency;
let inspectPort;
const options = parseCommandLine();

if (isUsingInspector()) {
process.emitWarning('Using the inspector with --test forces running at a concurrency of 1. ' +
'Use the inspectPort option to run with concurrency');
concurrency = 1;
inspectPort = process.debugPort;
options.concurrency = 1;
options.inspectPort = process.debugPort;
}

const options = {
concurrency,
inspectPort,
watch: watchMode,
setup: setupTestReporters,
timeout: perFileTimeout,
shard,
globPatterns: ArrayPrototypeSlice(process.argv, 1),
};
options.setup = setupTestReporters;
options.globPatterns = ArrayPrototypeSlice(process.argv, 1);

debug('test runner configuration:', options);
run(options).on('test:fail', (data) => {
if (data.todo === undefined || data.todo === false) {
Expand Down
2 changes: 1 addition & 1 deletion lib/internal/test_runner/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const {
sourceMaps,
testNamePatterns,
testSkipPatterns,
testOnlyFlag,
only: testOnlyFlag,
updateSnapshots,
} = parseCommandLine();
let kResistStopPropagation;
Expand Down
34 changes: 17 additions & 17 deletions lib/internal/test_runner/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,19 +197,19 @@ function parseCommandLine() {
const forceExit = getOptionValue('--test-force-exit');
const sourceMaps = getOptionValue('--enable-source-maps');
const updateSnapshots = getOptionValue('--test-update-snapshots');
const watchMode = getOptionValue('--watch');
const watch = getOptionValue('--watch');
const isChildProcess = process.env.NODE_TEST_CONTEXT === 'child';
const isChildProcessV8 = process.env.NODE_TEST_CONTEXT === 'child-v8';
let concurrency;
let coverageExcludeGlobs;
let coverageIncludeGlobs;
let destinations;
let perFileTimeout;
let only;
let reporters;
let runnerConcurrency;
let shard;
let testNamePatterns;
let testSkipPatterns;
let testOnlyFlag;
let shard;
let timeout;

if (isChildProcessV8) {
kBuiltinReporters.set('v8-serializer', 'internal/test_runner/reporter/v8-serializer');
Expand Down Expand Up @@ -239,9 +239,9 @@ function parseCommandLine() {
}

if (isTestRunner) {
perFileTimeout = getOptionValue('--test-timeout') || Infinity;
runnerConcurrency = getOptionValue('--test-concurrency') || true;
testOnlyFlag = false;
timeout = getOptionValue('--test-timeout') || Infinity;
concurrency = getOptionValue('--test-concurrency') || true;
only = false;
testNamePatterns = null;

const shardOption = getOptionValue('--test-shard');
Expand All @@ -262,10 +262,10 @@ function parseCommandLine() {
};
}
} else {
perFileTimeout = Infinity;
runnerConcurrency = 1;
timeout = Infinity;
concurrency = 1;
const testNamePatternFlag = getOptionValue('--test-name-pattern');
testOnlyFlag = getOptionValue('--test-only');
only = getOptionValue('--test-only');
testNamePatterns = testNamePatternFlag?.length > 0 ?
ArrayPrototypeMap(
testNamePatternFlag,
Expand All @@ -284,21 +284,21 @@ function parseCommandLine() {
globalTestOptions = {
__proto__: null,
isTestRunner,
concurrency,
coverage,
coverageExcludeGlobs,
coverageIncludeGlobs,
destinations,
forceExit,
perFileTimeout,
runnerConcurrency,
only,
reporters,
shard,
sourceMaps,
testOnlyFlag,
testNamePatterns,
testSkipPatterns,
timeout,
updateSnapshots,
reporters,
destinations,
watchMode,
watch,
};

return globalTestOptions;
Expand Down