GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — test_runner: accept `testOnly` in `run` · nodejs/node@80b342c

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

doc/api
- test.md
lib/internal/test_runner
- runner.js
test
- fixtures/test-runner
  - test_only.js
- parallel
  - test-runner-run.mjs

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎doc/api/test.md‎`

Copy file name to clipboardExpand all lines: doc/api/test.md

+2Lines changed: 2 additions & 0 deletions

Display the source diff
Display the rich diff

Original file line number	Diff line number	Diff line change
`@@ -906,6 +906,8 @@ changes:`
`906`	`906`	`number. If a nullish value is provided, each process gets its own port,`
`907`	`907`	incremented from the primary's `process.debugPort`.
`908`	`908`	Default: `undefined`.
	`909`	+ * `only`: {boolean} If truthy, the test context will only run tests that
	`910`	+ have the `only` option set
`909`	`911`	* `setup` {Function} A function that accepts the `TestsStream` instance
`910`	`912`	`and can be used to setup listeners before any tests are run.`
`911`	`913`	Default: `undefined`.

Collapse file

`‎lib/internal/test_runner/runner.js‎`

Copy file name to clipboardExpand all lines: lib/internal/test_runner/runner.js

+24-17Lines changed: 24 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -154,14 +154,17 @@ function filterExecArgv(arg, i, arr) {`
`154`	`154`	!ArrayPrototypeSome(kFilterArgValues, (p) => arg === p \|\| (i > 0 && arr[i - 1] === p) \|\| StringPrototypeStartsWith(arg, `${p}=`));
`155`	`155`	`}`
`156`	`156`
`157`		`-function getRunArgs({ path, inspectPort, testNamePatterns }) {`
	`157`	`+function getRunArgs(path, { inspectPort, testNamePatterns, only }) {`
`158`	`158`	`const argv = ArrayPrototypeFilter(process.execArgv, filterExecArgv);`
`159`	`159`	`if (isUsingInspector()) {`
`160`	`160`	ArrayPrototypePush(argv, `--inspect-port=${getInspectPort(inspectPort)}`);
`161`	`161`	`}`
`162`		`- if (testNamePatterns) {`
	`162`	`+ if (testNamePatterns != null) {`
`163`	`163`	ArrayPrototypeForEach(testNamePatterns, (pattern) => ArrayPrototypePush(argv, `--test-name-pattern=${pattern}`));
`164`	`164`	`}`
	`165`	`+ if (only === true) {`
	`166`	`+ ArrayPrototypePush(argv, '--test-only');`
	`167`	`+ }`
`165`	`168`	`ArrayPrototypePush(argv, path);`
`166`	`169`
`167`	`170`	`return argv;`
`@@ -345,17 +348,17 @@ class FileTest extends Test {`
`345`	`348`	`}`
`346`	`349`	`}`
`347`	`350`
`348`		`-function runTestFile(path, root, inspectPort, filesWatcher, testNamePatterns) {`
	`351`	`+function runTestFile(path, filesWatcher, opts) {`
`349`	`352`	`const watchMode = filesWatcher != null;`
`350`		`- const subtest = root.createSubtest(FileTest, path, async (t) => {`
`351`		`- const args = getRunArgs({ __proto__: null, path, inspectPort, testNamePatterns });`
	`353`	`+ const subtest = opts.root.createSubtest(FileTest, path, async (t) => {`
	`354`	`+ const args = getRunArgs(path, opts);`
`352`	`355`	`const stdio = ['pipe', 'pipe', 'pipe'];`
`353`	`356`	`const env = { __proto__: null, ...process.env, NODE_TEST_CONTEXT: 'child-v8' };`
`354`	`357`	`if (watchMode) {`
`355`	`358`	`stdio.push('ipc');`
`356`	`359`	`env.WATCH_REPORT_DEPENDENCIES = '1';`
`357`	`360`	`}`
`358`		`- if (root.harness.shouldColorizeTestFiles) {`
	`361`	`+ if (opts.root.harness.shouldColorizeTestFiles) {`
`359`	`362`	`env.FORCE_COLOR = '1';`
`360`	`363`	`}`
`361`	`364`
`@@ -402,7 +405,7 @@ function runTestFile(path, root, inspectPort, filesWatcher, testNamePatterns) {`
`402`	`405`	`filesWatcher.runningProcesses.delete(path);`
`403`	`406`	`filesWatcher.runningSubtests.delete(path);`
`404`	`407`	`if (filesWatcher.runningSubtests.size === 0) {`
`405`		`- root.reporter[kEmitMessage]('test:watch:drained');`
	`408`	`+ opts.root.reporter[kEmitMessage]('test:watch:drained');`
`406`	`409`	`}`
`407`	`410`	`}`
`408`	`411`
`@@ -425,10 +428,10 @@ function runTestFile(path, root, inspectPort, filesWatcher, testNamePatterns) {`
`425`	`428`	`return subtest.start();`
`426`	`429`	`}`
`427`	`430`
`428`		`-function watchFiles(testFiles, root, inspectPort, signal, testNamePatterns) {`
	`431`	`+function watchFiles(testFiles, opts) {`
`429`	`432`	`const runningProcesses = new SafeMap();`
`430`	`433`	`const runningSubtests = new SafeMap();`
`431`		`- const watcher = new FilesWatcher({ __proto__: null, debounce: 200, mode: 'filter', signal });`
	`434`	`+ const watcher = new FilesWatcher({ __proto__: null, debounce: 200, mode: 'filter', signal: opts.signal });`
`432`	`435`	`const filesWatcher = { __proto__: null, watcher, runningProcesses, runningSubtests };`
`433`	`436`
`434`	`437`	`watcher.on('changed', ({ owners }) => {`
`@@ -444,19 +447,19 @@ function watchFiles(testFiles, root, inspectPort, signal, testNamePatterns) {`
`444`	`447`	`}`
`445`	`448`	`if (!runningSubtests.size) {`
`446`	`449`	`// Reset the topLevel counter`
`447`		`- root.harness.counters.topLevel = 0;`
	`450`	`+ opts.root.harness.counters.topLevel = 0;`
`448`	`451`	`}`
`449`	`452`	`await runningSubtests.get(file);`
`450`		`- runningSubtests.set(file, runTestFile(file, root, inspectPort, filesWatcher, testNamePatterns));`
	`453`	`+ runningSubtests.set(file, runTestFile(file, filesWatcher, opts));`
`451`	`454`	`}, undefined, (error) => {`
`452`	`455`	`triggerUncaughtException(error, true /* fromPromise */);`
`453`	`456`	`}));`
`454`	`457`	`});`
`455`		`- if (signal) {`
	`458`	`+ if (opts.signal) {`
`456`	`459`	`kResistStopPropagation ??= require('internal/event_target').kResistStopPropagation;`
`457`		`- signal.addEventListener(`
	`460`	`+ opts.signal.addEventListener(`
`458`	`461`	`'abort',`
`459`		`- () => root.postRun(),`
	`462`	`+ () => opts.root.postRun(),`
`460`	`463`	`{ __proto__: null, once: true, [kResistStopPropagation]: true },`
`461`	`464`	`);`
`462`	`465`	`}`
`@@ -469,14 +472,17 @@ function run(options) {`
`469`	`472`	`options = kEmptyObject;`
`470`	`473`	`}`
`471`	`474`	`let { testNamePatterns, shard } = options;`
`472`		`- const { concurrency, timeout, signal, files, inspectPort, watch, setup } = options;`
	`475`	`+ const { concurrency, timeout, signal, files, inspectPort, watch, setup, only } = options;`
`473`	`476`
`474`	`477`	`if (files != null) {`
`475`	`478`	`validateArray(files, 'options.files');`
`476`	`479`	`}`
`477`	`480`	`if (watch != null) {`
`478`	`481`	`validateBoolean(watch, 'options.watch');`
`479`	`482`	`}`
	`483`	`+ if (only != null) {`
	`484`	`+ validateBoolean(only, 'options.only');`
	`485`	`+ }`
`480`	`486`	`if (shard != null) {`
`481`	`487`	`validateObject(shard, 'options.shard');`
`482`	`488`	`// Avoid re-evaluating the shard object in case it's a getter`
`@@ -522,14 +528,15 @@ function run(options) {`
`522`	`528`
`523`	`529`	`let postRun = () => root.postRun();`
`524`	`530`	`let filesWatcher;`
	`531`	`+ const opts = { __proto__: null, root, signal, inspectPort, testNamePatterns, only };`
`525`	`532`	`if (watch) {`
`526`		`- filesWatcher = watchFiles(testFiles, root, inspectPort, signal, testNamePatterns);`
	`533`	`+ filesWatcher = watchFiles(testFiles, opts);`
`527`	`534`	`postRun = undefined;`
`528`	`535`	`}`
`529`	`536`	`const runFiles = () => {`
`530`	`537`	`root.harness.bootstrapComplete = true;`
`531`	`538`	`return SafePromiseAllSettledReturnVoid(testFiles, (path) => {`
`532`		`- const subtest = runTestFile(path, root, inspectPort, filesWatcher, testNamePatterns);`
	`539`	`+ const subtest = runTestFile(path, filesWatcher, opts);`
`533`	`540`	`filesWatcher?.runningSubtests.set(path, subtest);`
`534`	`541`	`return subtest;`
`535`	`542`	`});`

Collapse file

`‎test/fixtures/test-runner/test_only.js‎`

Copy file name to clipboard

+5Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,5 @@`
	`1`	`+'use strict';`
	`2`	`+const test = require('node:test');`
	`3`	`+`
	`4`	`+test('this should be skipped');`
	`5`	`+test.only('this should be executed');`

Collapse file

`‎test/parallel/test-runner-run.mjs‎`

Copy file name to clipboardExpand all lines: test/parallel/test-runner-run.mjs

+12Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,18 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {`
`148`	`148`	`assert.strictEqual(result[5], 'ok 2 - this should be executed\n');`
`149`	`149`	`});`
`150`	`150`
	`151`	`+ it('should pass only to children', async () => {`
	`152`	`+ const result = await run({`
	`153`	`+ files: [join(testFixtures, 'test_only.js')],`
	`154`	`+ only: true`
	`155`	`+ })`
	`156`	`+ .compose(tap)`
	`157`	`+ .toArray();`
	`158`	`+`
	`159`	`+ assert.strictEqual(result[2], 'ok 1 - this should be skipped # SKIP \'only\' option not set\n');`
	`160`	`+ assert.strictEqual(result[5], 'ok 2 - this should be executed\n');`
	`161`	`+ });`
	`162`	`+`
`151`	`163`	`it('should emit "test:watch:drained" event on watch mode', async () => {`
`152`	`164`	`const controller = new AbortController();`
`153`	`165`	`await run({`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.