Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit cd71d18

Browse files
pmarchiniaduh95
pmarchini
authored and
aduh95
committedDec 18, 2024
test_runner: exclude test files from coverage by default
PR-URL: #56060 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
1 parent 32ff44b commit cd71d18

18 files changed

+328
-55
lines changed
 

‎doc/api/cli.md

+3
Original file line numberDiff line numberDiff line change
@@ -2267,6 +2267,9 @@ This option may be specified multiple times to exclude multiple glob patterns.
22672267
If both `--test-coverage-exclude` and `--test-coverage-include` are provided,
22682268
files must meet **both** criteria to be included in the coverage report.
22692269

2270+
By default all the matching test files are excluded from the coverage report.
2271+
Specifying this option will override the default behavior.
2272+
22702273
### `--test-coverage-functions=threshold`
22712274

22722275
<!-- YAML

‎doc/api/test.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -476,8 +476,10 @@ all tests have completed. If the [`NODE_V8_COVERAGE`][] environment variable is
476476
used to specify a code coverage directory, the generated V8 coverage files are
477477
written to that directory. Node.js core modules and files within
478478
`node_modules/` directories are, by default, not included in the coverage report.
479-
However, they can be explicitly included via the [`--test-coverage-include`][] flag. If
480-
coverage is enabled, the coverage report is sent to any [test reporters][] via
479+
However, they can be explicitly included via the [`--test-coverage-include`][] flag.
480+
By default all the matching test files are excluded from the coverage report.
481+
Exclusions can be overridden by using the [`--test-coverage-exclude`][] flag.
482+
If coverage is enabled, the coverage report is sent to any [test reporters][] via
481483
the `'test:coverage'` event.
482484

483485
Coverage can be disabled on a series of lines using the following
@@ -3592,6 +3594,7 @@ Can be used to abort test subtasks when the test has been aborted.
35923594
[`--experimental-test-module-mocks`]: cli.md#--experimental-test-module-mocks
35933595
[`--import`]: cli.md#--importmodule
35943596
[`--test-concurrency`]: cli.md#--test-concurrency
3597+
[`--test-coverage-exclude`]: cli.md#--test-coverage-exclude
35953598
[`--test-coverage-include`]: cli.md#--test-coverage-include
35963599
[`--test-name-pattern`]: cli.md#--test-name-pattern
35973600
[`--test-only`]: cli.md#--test-only

‎lib/internal/fs/glob.js

+23
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,30 @@ class Glob {
650650
}
651651
}
652652

653+
/**
654+
* Check if a path matches a glob pattern
655+
* @param {string} path the path to check
656+
* @param {string} pattern the glob pattern to match
657+
* @param {boolean} windows whether the path is on a Windows system, defaults to `isWindows`
658+
* @returns {boolean}
659+
*/
660+
function matchGlobPattern(path, pattern, windows = isWindows) {
661+
validateString(path, 'path');
662+
validateString(pattern, 'pattern');
663+
return lazyMinimatch().minimatch(path, pattern, {
664+
kEmptyObject,
665+
nocase: isMacOS || isWindows,
666+
windowsPathsNoEscape: true,
667+
nonegate: true,
668+
nocomment: true,
669+
optimizationLevel: 2,
670+
platform: windows ? 'win32' : 'posix',
671+
nocaseMagicOnly: true,
672+
});
673+
}
674+
653675
module.exports = {
654676
__proto__: null,
655677
Glob,
678+
matchGlobPattern,
656679
};

‎lib/internal/test_runner/coverage.js

+12-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const {
2727
} = require('fs');
2828
const { setupCoverageHooks } = require('internal/util');
2929
const { tmpdir } = require('os');
30-
const { join, resolve, relative, matchesGlob } = require('path');
30+
const { join, resolve, relative } = require('path');
3131
const { fileURLToPath } = require('internal/url');
3232
const { kMappings, SourceMap } = require('internal/source_map/source_map');
3333
const {
@@ -36,6 +36,8 @@ const {
3636
ERR_SOURCE_MAP_MISSING_SOURCE,
3737
},
3838
} = require('internal/errors');
39+
const { matchGlobPattern } = require('internal/fs/glob');
40+
3941
const kCoverageFileRegex = /^coverage-(\d+)-(\d{13})-(\d+)\.json$/;
4042
const kIgnoreRegex = /\/\* node:coverage ignore next (?<count>\d+ )?\*\//;
4143
const kLineEndingRegex = /\r?\n$/u;
@@ -464,19 +466,24 @@ class TestCoverage {
464466
coverageExcludeGlobs: excludeGlobs,
465467
coverageIncludeGlobs: includeGlobs,
466468
} = this.options;
469+
467470
// This check filters out files that match the exclude globs.
468471
if (excludeGlobs?.length > 0) {
469472
for (let i = 0; i < excludeGlobs.length; ++i) {
470-
if (matchesGlob(relativePath, excludeGlobs[i]) ||
471-
matchesGlob(absolutePath, excludeGlobs[i])) return true;
473+
if (
474+
matchGlobPattern(relativePath, excludeGlobs[i]) ||
475+
matchGlobPattern(absolutePath, excludeGlobs[i])
476+
) return true;
472477
}
473478
}
474479

475480
// This check filters out files that do not match the include globs.
476481
if (includeGlobs?.length > 0) {
477482
for (let i = 0; i < includeGlobs.length; ++i) {
478-
if (matchesGlob(relativePath, includeGlobs[i]) ||
479-
matchesGlob(absolutePath, includeGlobs[i])) return false;
483+
if (
484+
matchGlobPattern(relativePath, includeGlobs[i]) ||
485+
matchGlobPattern(absolutePath, includeGlobs[i])
486+
) return false;
480487
}
481488
return true;
482489
}

‎lib/internal/test_runner/utils.js

+5
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,11 @@ function parseCommandLine() {
287287

288288
if (coverage) {
289289
coverageExcludeGlobs = getOptionValue('--test-coverage-exclude');
290+
if (!coverageExcludeGlobs || coverageExcludeGlobs.length === 0) {
291+
// TODO(pmarchini): this default should follow something similar to c8 defaults
292+
// Default exclusions should be also exported to be used by other tools / users
293+
coverageExcludeGlobs = [kDefaultPattern];
294+
}
290295
coverageIncludeGlobs = getOptionValue('--test-coverage-include');
291296

292297
branchCoverage = getOptionValue('--test-coverage-branches');

‎lib/path.js

+6-21
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,12 @@ const {
5252
} = require('internal/validators');
5353

5454
const {
55-
getLazy,
5655
emitExperimentalWarning,
5756
isWindows,
58-
isMacOS,
57+
getLazy,
5958
} = require('internal/util');
6059

61-
const lazyMinimatch = getLazy(() => require('internal/deps/minimatch/index'));
60+
const lazyMatchGlobPattern = getLazy(() => require('internal/fs/glob').matchGlobPattern);
6261

6362
function isPathSeparator(code) {
6463
return code === CHAR_FORWARD_SLASH || code === CHAR_BACKWARD_SLASH;
@@ -164,22 +163,6 @@ function _format(sep, pathObject) {
164163
return dir === pathObject.root ? `${dir}${base}` : `${dir}${sep}${base}`;
165164
}
166165

167-
function glob(path, pattern, windows) {
168-
emitExperimentalWarning('glob');
169-
validateString(path, 'path');
170-
validateString(pattern, 'pattern');
171-
return lazyMinimatch().minimatch(path, pattern, {
172-
__proto__: null,
173-
nocase: isMacOS || isWindows,
174-
windowsPathsNoEscape: true,
175-
nonegate: true,
176-
nocomment: true,
177-
optimizationLevel: 2,
178-
platform: windows ? 'win32' : 'posix',
179-
nocaseMagicOnly: true,
180-
});
181-
}
182-
183166
const win32 = {
184167
/**
185168
* path.resolve([from ...], to)
@@ -1140,7 +1123,8 @@ const win32 = {
11401123
},
11411124

11421125
matchesGlob(path, pattern) {
1143-
return glob(path, pattern, true);
1126+
emitExperimentalWarning('glob');
1127+
return lazyMatchGlobPattern()(path, pattern, true);
11441128
},
11451129

11461130
sep: '\\',
@@ -1616,7 +1600,8 @@ const posix = {
16161600
},
16171601

16181602
matchesGlob(path, pattern) {
1619-
return glob(path, pattern, false);
1603+
emitExperimentalWarning('glob');
1604+
return lazyMatchGlobPattern()(path, pattern, false);
16201605
},
16211606

16221607
sep: '/',

‎test/fixtures/test-runner/coverage-default-exclusion/file-test.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
const test = require('node:test');
2+
const assert = require('node:assert');
3+
const { foo } = require('./logic-file');
4+
5+
test('foo returns 1', () => {
6+
assert.strictEqual(foo(), 1);
7+
});

‎test/fixtures/test-runner/coverage-default-exclusion/file.test.mjs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import test from 'node:test';
2+
import assert from 'node:assert';
3+
import { foo } from './logic-file.js';
4+
5+
test('foo returns 1', () => {
6+
assert.strictEqual(foo(), 1);
7+
});

‎test/fixtures/test-runner/coverage-default-exclusion/file.test.ts

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import test from 'node:test';
2+
import assert from 'node:assert';
3+
import { foo } from './logic-file.js';
4+
5+
test('foo returns 1', () => {
6+
assert.strictEqual(foo(), 1);
7+
});

‎test/fixtures/test-runner/coverage-default-exclusion/logic-file.js

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
function foo() {
2+
return 1;
3+
}
4+
5+
function bar() {
6+
return 'bar';
7+
}
8+
9+
module.exports = { foo, bar };

‎test/fixtures/test-runner/coverage-default-exclusion/test.cjs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
const test = require('node:test');
2+
const assert = require('node:assert');
3+
const { foo } = require('./logic-file.js');
4+
5+
test('foo returns 1', () => {
6+
assert.strictEqual(foo(), 1);
7+
});

‎test/fixtures/test-runner/coverage-default-exclusion/test/not-matching-test-name.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
const test = require('node:test');
2+
const assert = require('node:assert');
3+
const { foo } = require('../logic-file.js');
4+
5+
test('foo returns 1', () => {
6+
assert.strictEqual(foo(), 1);
7+
});

‎test/fixtures/test-runner/output/lcov_reporter.js

+10-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,13 @@ const fixtures = require('../../../common/fixtures');
44
const spawn = require('node:child_process').spawn;
55

66
spawn(process.execPath,
7-
['--no-warnings', '--experimental-test-coverage', '--test-reporter', 'lcov', fixtures.path('test-runner/output/output.js')], { stdio: 'inherit' });
7+
[
8+
'--no-warnings',
9+
'--experimental-test-coverage',
10+
'--test-coverage-exclude=!test/**',
11+
'--test-reporter',
12+
'lcov',
13+
fixtures.path('test-runner/output/output.js')
14+
],
15+
{ stdio: 'inherit' }
16+
);

‎test/parallel/test-runner-coverage-default-exclusion.mjs

+116
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
import '../common/index.mjs';
2+
import { before, describe, it } from 'node:test';
3+
import assert from 'node:assert';
4+
import { spawnSync } from 'node:child_process';
5+
import { cp } from 'node:fs/promises';
6+
import tmpdir from '../common/tmpdir.js';
7+
import fixtures from '../common/fixtures.js';
8+
const skipIfNoInspector = {
9+
skip: !process.features.inspector ? 'inspector disabled' : false
10+
};
11+
12+
tmpdir.refresh();
13+
14+
async function setupFixtures() {
15+
const fixtureDir = fixtures.path('test-runner', 'coverage-default-exclusion');
16+
await cp(fixtureDir, tmpdir.path, { recursive: true });
17+
}
18+
19+
describe('test runner coverage default exclusion', skipIfNoInspector, () => {
20+
before(async () => {
21+
await setupFixtures();
22+
});
23+
24+
it('should override default exclusion setting --test-coverage-exclude', async () => {
25+
const report = [
26+
'# start of coverage report',
27+
'# ---------------------------------------------------------------------------',
28+
'# file | line % | branch % | funcs % | uncovered lines',
29+
'# ---------------------------------------------------------------------------',
30+
'# file-test.js | 100.00 | 100.00 | 100.00 | ',
31+
'# file.test.mjs | 100.00 | 100.00 | 100.00 | ',
32+
'# logic-file.js | 66.67 | 100.00 | 50.00 | 5-7',
33+
'# test.cjs | 100.00 | 100.00 | 100.00 | ',
34+
'# test | | | | ',
35+
'# not-matching-test-name.js | 100.00 | 100.00 | 100.00 | ',
36+
'# ---------------------------------------------------------------------------',
37+
'# all files | 91.89 | 100.00 | 83.33 | ',
38+
'# ---------------------------------------------------------------------------',
39+
'# end of coverage report',
40+
].join('\n');
41+
42+
43+
const args = [
44+
'--test',
45+
'--experimental-test-coverage',
46+
'--test-coverage-exclude=!test/**',
47+
'--test-reporter=tap',
48+
];
49+
const result = spawnSync(process.execPath, args, {
50+
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
51+
cwd: tmpdir.path
52+
});
53+
54+
assert.strictEqual(result.stderr.toString(), '');
55+
assert(result.stdout.toString().includes(report));
56+
assert.strictEqual(result.status, 0);
57+
});
58+
59+
it('should exclude test files from coverage by default', async () => {
60+
const report = [
61+
'# start of coverage report',
62+
'# --------------------------------------------------------------',
63+
'# file | line % | branch % | funcs % | uncovered lines',
64+
'# --------------------------------------------------------------',
65+
'# logic-file.js | 66.67 | 100.00 | 50.00 | 5-7',
66+
'# --------------------------------------------------------------',
67+
'# all files | 66.67 | 100.00 | 50.00 | ',
68+
'# --------------------------------------------------------------',
69+
'# end of coverage report',
70+
].join('\n');
71+
72+
const args = [
73+
'--test',
74+
'--experimental-test-coverage',
75+
'--test-reporter=tap',
76+
];
77+
const result = spawnSync(process.execPath, args, {
78+
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
79+
cwd: tmpdir.path
80+
});
81+
82+
assert.strictEqual(result.stderr.toString(), '');
83+
assert(result.stdout.toString().includes(report));
84+
assert.strictEqual(result.status, 0);
85+
});
86+
87+
it('should exclude ts test files when using --experimental-strip-types', async () => {
88+
const report = [
89+
'# start of coverage report',
90+
'# --------------------------------------------------------------',
91+
'# file | line % | branch % | funcs % | uncovered lines',
92+
'# --------------------------------------------------------------',
93+
'# logic-file.js | 66.67 | 100.00 | 50.00 | 5-7',
94+
'# --------------------------------------------------------------',
95+
'# all files | 66.67 | 100.00 | 50.00 | ',
96+
'# --------------------------------------------------------------',
97+
'# end of coverage report',
98+
].join('\n');
99+
100+
const args = [
101+
'--test',
102+
'--experimental-test-coverage',
103+
'--experimental-strip-types',
104+
'--disable-warning=ExperimentalWarning',
105+
'--test-reporter=tap',
106+
];
107+
const result = spawnSync(process.execPath, args, {
108+
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
109+
cwd: tmpdir.path
110+
});
111+
112+
assert.strictEqual(result.stderr.toString(), '');
113+
assert(result.stdout.toString().includes(report));
114+
assert.strictEqual(result.status, 0);
115+
});
116+
});

‎test/parallel/test-runner-coverage-source-map.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ function generateReport(report) {
2020

2121
const flags = [
2222
'--enable-source-maps',
23-
'--test', '--experimental-test-coverage', '--test-reporter', 'tap',
23+
'--test',
24+
'--experimental-test-coverage',
25+
'--test-coverage-exclude=!test/**',
26+
'--test-reporter',
27+
'tap',
2428
];
2529

2630
describe('Coverage with source maps', async () => {

‎test/parallel/test-runner-coverage-thresholds.js

+6
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ for (const coverage of coverages) {
6161
const result = spawnSync(process.execPath, [
6262
'--test',
6363
'--experimental-test-coverage',
64+
'--test-coverage-exclude=!test/**',
6465
`${coverage.flag}=25`,
6566
'--test-reporter', 'tap',
6667
fixture,
@@ -77,6 +78,7 @@ for (const coverage of coverages) {
7778
const result = spawnSync(process.execPath, [
7879
'--test',
7980
'--experimental-test-coverage',
81+
'--test-coverage-exclude=!test/**',
8082
`${coverage.flag}=25`,
8183
'--test-reporter', reporter,
8284
fixture,
@@ -92,6 +94,7 @@ for (const coverage of coverages) {
9294
const result = spawnSync(process.execPath, [
9395
'--test',
9496
'--experimental-test-coverage',
97+
'--test-coverage-exclude=!test/**',
9598
`${coverage.flag}=99`,
9699
'--test-reporter', 'tap',
97100
fixture,
@@ -108,6 +111,7 @@ for (const coverage of coverages) {
108111
const result = spawnSync(process.execPath, [
109112
'--test',
110113
'--experimental-test-coverage',
114+
'--test-coverage-exclude=!test/**',
111115
`${coverage.flag}=99`,
112116
'--test-reporter', reporter,
113117
fixture,
@@ -123,6 +127,7 @@ for (const coverage of coverages) {
123127
const result = spawnSync(process.execPath, [
124128
'--test',
125129
'--experimental-test-coverage',
130+
'--test-coverage-exclude=!test/**',
126131
`${coverage.flag}=101`,
127132
fixture,
128133
]);
@@ -136,6 +141,7 @@ for (const coverage of coverages) {
136141
const result = spawnSync(process.execPath, [
137142
'--test',
138143
'--experimental-test-coverage',
144+
'--test-coverage-exclude=!test/**',
139145
`${coverage.flag}=-1`,
140146
fixture,
141147
]);

‎test/parallel/test-runner-coverage.js

+75-14
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,11 @@ test('test coverage report', async (t) => {
8484
}
8585

8686
const fixture = fixtures.path('test-runner', 'coverage.js');
87-
const args = ['--experimental-test-coverage', fixture];
87+
const args = [
88+
'--experimental-test-coverage',
89+
'--test-coverage-exclude=!test/**',
90+
fixture,
91+
];
8892
const result = spawnSync(process.execPath, args);
8993

9094
assert(!result.stdout.toString().includes('# start of coverage report'));
@@ -97,7 +101,13 @@ test('test coverage report', async (t) => {
97101
test('test tap coverage reporter', skipIfNoInspector, async (t) => {
98102
await t.test('coverage is reported and dumped to NODE_V8_COVERAGE if present', (t) => {
99103
const fixture = fixtures.path('test-runner', 'coverage.js');
100-
const args = ['--experimental-test-coverage', '--test-reporter', 'tap', fixture];
104+
const args = [
105+
'--experimental-test-coverage',
106+
'--test-coverage-exclude=!test/**',
107+
'--test-reporter',
108+
'tap',
109+
fixture,
110+
];
101111
const options = { env: { ...process.env, NODE_V8_COVERAGE: tmpdir.path } };
102112
const result = spawnSync(process.execPath, args, options);
103113
const report = getTapCoverageFixtureReport();
@@ -109,7 +119,13 @@ test('test tap coverage reporter', skipIfNoInspector, async (t) => {
109119

110120
await t.test('coverage is reported without NODE_V8_COVERAGE present', (t) => {
111121
const fixture = fixtures.path('test-runner', 'coverage.js');
112-
const args = ['--experimental-test-coverage', '--test-reporter', 'tap', fixture];
122+
const args = [
123+
'--experimental-test-coverage',
124+
'--test-coverage-exclude=!test/**',
125+
'--test-reporter',
126+
'tap',
127+
fixture,
128+
];
113129
const result = spawnSync(process.execPath, args);
114130
const report = getTapCoverageFixtureReport();
115131

@@ -123,7 +139,12 @@ test('test tap coverage reporter', skipIfNoInspector, async (t) => {
123139
test('test spec coverage reporter', skipIfNoInspector, async (t) => {
124140
await t.test('coverage is reported and dumped to NODE_V8_COVERAGE if present', (t) => {
125141
const fixture = fixtures.path('test-runner', 'coverage.js');
126-
const args = ['--experimental-test-coverage', '--test-reporter', 'spec', fixture];
142+
const args = [
143+
'--experimental-test-coverage',
144+
'--test-coverage-exclude=!test/**',
145+
'--test-reporter',
146+
'spec',
147+
fixture];
127148
const options = { env: { ...process.env, NODE_V8_COVERAGE: tmpdir.path } };
128149
const result = spawnSync(process.execPath, args, options);
129150
const report = getSpecCoverageFixtureReport();
@@ -136,7 +157,12 @@ test('test spec coverage reporter', skipIfNoInspector, async (t) => {
136157

137158
await t.test('coverage is reported without NODE_V8_COVERAGE present', (t) => {
138159
const fixture = fixtures.path('test-runner', 'coverage.js');
139-
const args = ['--experimental-test-coverage', '--test-reporter', 'spec', fixture];
160+
const args = [
161+
'--experimental-test-coverage',
162+
'--test-coverage-exclude=!test/**',
163+
'--test-reporter',
164+
'spec',
165+
fixture];
140166
const result = spawnSync(process.execPath, args);
141167
const report = getSpecCoverageFixtureReport();
142168

@@ -150,7 +176,12 @@ test('test spec coverage reporter', skipIfNoInspector, async (t) => {
150176
test('single process coverage is the same with --test', skipIfNoInspector, () => {
151177
const fixture = fixtures.path('test-runner', 'coverage.js');
152178
const args = [
153-
'--test', '--experimental-test-coverage', '--test-reporter', 'tap', fixture,
179+
'--test',
180+
'--experimental-test-coverage',
181+
'--test-coverage-exclude=!test/**',
182+
'--test-reporter',
183+
'tap',
184+
fixture,
154185
];
155186
const result = spawnSync(process.execPath, args);
156187
const report = getTapCoverageFixtureReport();
@@ -183,7 +214,11 @@ test('coverage is combined for multiple processes', skipIfNoInspector, () => {
183214

184215
const fixture = fixtures.path('v8-coverage', 'combined_coverage');
185216
const args = [
186-
'--test', '--experimental-test-coverage', '--test-reporter', 'tap',
217+
'--test',
218+
'--experimental-test-coverage',
219+
'--test-coverage-exclude=!test/**',
220+
'--test-reporter',
221+
'tap',
187222
];
188223
const result = spawnSync(process.execPath, args, {
189224
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
@@ -221,7 +256,11 @@ test.skip('coverage works with isolation=none', skipIfNoInspector, () => {
221256

222257
const fixture = fixtures.path('v8-coverage', 'combined_coverage');
223258
const args = [
224-
'--test', '--experimental-test-coverage', '--test-reporter', 'tap', '--experimental-test-isolation=none',
259+
'--test',
260+
'--experimental-test-coverage',
261+
'--test-reporter',
262+
'tap',
263+
'--experimental-test-isolation=none',
225264
];
226265
const result = spawnSync(process.execPath, args, {
227266
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
@@ -236,9 +275,14 @@ test.skip('coverage works with isolation=none', skipIfNoInspector, () => {
236275
test('coverage reports on lines, functions, and branches', skipIfNoInspector, async (t) => {
237276
const fixture = fixtures.path('test-runner', 'coverage.js');
238277
const child = spawnSync(process.execPath,
239-
['--test', '--experimental-test-coverage', '--test-reporter',
240-
fixtures.fileURL('test-runner/custom_reporters/coverage.mjs'),
241-
fixture]);
278+
[
279+
'--test',
280+
'--experimental-test-coverage',
281+
'--test-coverage-exclude=!test/**',
282+
'--test-reporter',
283+
fixtures.fileURL('test-runner/custom_reporters/coverage.mjs'),
284+
fixture,
285+
]);
242286
assert.strictEqual(child.stderr.toString(), '');
243287
const stdout = child.stdout.toString();
244288
const coverage = JSON.parse(stdout);
@@ -310,7 +354,14 @@ test('coverage with ESM hook - source irrelevant', skipIfNoInspector, () => {
310354

311355
const fixture = fixtures.path('test-runner', 'coverage-loader');
312356
const args = [
313-
'--import', './register-hooks.js', '--test', '--experimental-test-coverage', '--test-reporter', 'tap', 'virtual.js',
357+
'--import',
358+
'./register-hooks.js',
359+
'--test',
360+
'--experimental-test-coverage',
361+
'--test-coverage-exclude=!test/**',
362+
'--test-reporter',
363+
'tap',
364+
'virtual.js',
314365
];
315366
const result = spawnSync(process.execPath, args, { cwd: fixture });
316367

@@ -341,7 +392,10 @@ test('coverage with ESM hook - source transpiled', skipIfNoInspector, () => {
341392

342393
const fixture = fixtures.path('test-runner', 'coverage-loader');
343394
const args = [
344-
'--import', './register-hooks.js', '--test', '--experimental-test-coverage',
395+
'--import', './register-hooks.js',
396+
'--test',
397+
'--experimental-test-coverage',
398+
'--test-coverage-exclude=!test/**',
345399
'--test-reporter', 'tap', 'sum.test.ts',
346400
];
347401
const result = spawnSync(process.execPath, args, { cwd: fixture });
@@ -356,6 +410,7 @@ test('coverage with excluded files', skipIfNoInspector, () => {
356410
const args = [
357411
'--experimental-test-coverage', '--test-reporter', 'tap',
358412
'--test-coverage-exclude=test/*/test-runner/invalid-tap.js',
413+
'--test-coverage-exclude=!test/**',
359414
fixture];
360415
const result = spawnSync(process.execPath, args);
361416
const report = [
@@ -391,6 +446,7 @@ test('coverage with included files', skipIfNoInspector, () => {
391446
'--experimental-test-coverage', '--test-reporter', 'tap',
392447
'--test-coverage-include=test/fixtures/test-runner/coverage.js',
393448
'--test-coverage-include=test/fixtures/v8-coverage/throw.js',
449+
'--test-coverage-exclude=!test/**',
394450
fixture,
395451
];
396452
const result = spawnSync(process.execPath, args);
@@ -478,7 +534,12 @@ test('correctly prints the coverage report of files contained in parent director
478534
}
479535
const fixture = fixtures.path('test-runner', 'coverage.js');
480536
const args = [
481-
'--test', '--experimental-test-coverage', '--test-reporter', 'tap', fixture,
537+
'--test',
538+
'--experimental-test-coverage',
539+
'--test-coverage-exclude=!test/**',
540+
'--test-reporter',
541+
'tap',
542+
fixture,
482543
];
483544
const result = spawnSync(process.execPath, args, {
484545
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },

‎test/parallel/test-runner-output.mjs

+18-11
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,12 @@ const tests = [
171171
name: 'test-runner/output/source_mapped_locations.mjs',
172172
flags: ['--test-reporter=tap'],
173173
},
174-
process.features.inspector ? { name: 'test-runner/output/lcov_reporter.js', transform: lcovTransform } : false,
174+
process.features.inspector ?
175+
{
176+
name: 'test-runner/output/lcov_reporter.js',
177+
transform: lcovTransform
178+
} :
179+
false,
175180
{ name: 'test-runner/output/output.js', flags: ['--test-reporter=tap'] },
176181
{ name: 'test-runner/output/output_cli.js' },
177182
{
@@ -236,57 +241,59 @@ const tests = [
236241
},
237242
process.features.inspector ? {
238243
name: 'test-runner/output/coverage_failure.js',
239-
flags: ['--test-reporter=tap'],
244+
flags: ['--test-reporter=tap', '--test-coverage-exclude=!test/**'],
240245
} : false,
241246
{
242247
name: 'test-runner/output/test-diagnostic-warning-without-test-only-flag.js',
243248
flags: ['--test', '--test-reporter=tap'],
244249
},
245250
process.features.inspector ? {
246251
name: 'test-runner/output/coverage-width-40.mjs',
247-
flags: ['--test-reporter=tap'],
252+
flags: ['--test-reporter=tap', '--test-coverage-exclude=!test/**'],
248253
} : false,
249254
process.features.inspector ? {
250255
name: 'test-runner/output/coverage-width-80.mjs',
251-
flags: ['--test-reporter=tap'],
256+
flags: ['--test-reporter=tap', '--test-coverage-exclude=!test/**'],
252257
} : false,
253258
process.features.inspector && !skipCoverageColors ? {
254259
name: 'test-runner/output/coverage-width-80-color.mjs',
260+
flags: ['--test-coverage-exclude=!test/**'],
255261
transform: specTransform,
256262
tty: true
257263
} : false,
258264
process.features.inspector ? {
259265
name: 'test-runner/output/coverage-width-100.mjs',
260-
flags: ['--test-reporter=tap'],
266+
flags: ['--test-reporter=tap', '--test-coverage-exclude=!test/**'],
261267
} : false,
262268
process.features.inspector ? {
263269
name: 'test-runner/output/coverage-width-150.mjs',
264-
flags: ['--test-reporter=tap'],
270+
flags: ['--test-reporter=tap', '--test-coverage-exclude=!test/**'],
265271
} : false,
266272
process.features.inspector ? {
267273
name: 'test-runner/output/coverage-width-infinity.mjs',
268-
flags: ['--test-reporter=tap'],
274+
flags: ['--test-reporter=tap', '--test-coverage-exclude=!test/**'],
269275
} : false,
270276
process.features.inspector ? {
271277
name: 'test-runner/output/coverage-width-80-uncovered-lines.mjs',
272-
flags: ['--test-reporter=tap'],
278+
flags: ['--test-reporter=tap', '--test-coverage-exclude=!test/**'],
273279
} : false,
274280
process.features.inspector ? {
275281
name: 'test-runner/output/coverage-width-100-uncovered-lines.mjs',
276-
flags: ['--test-reporter=tap'],
282+
flags: ['--test-reporter=tap', '--test-coverage-exclude=!test/**'],
277283
} : false,
278284
process.features.inspector && !skipCoverageColors ? {
279285
name: 'test-runner/output/coverage-width-80-uncovered-lines-color.mjs',
286+
flags: ['--test-coverage-exclude=!test/**'],
280287
transform: specTransform,
281288
tty: true
282289
} : false,
283290
process.features.inspector ? {
284291
name: 'test-runner/output/coverage-width-150-uncovered-lines.mjs',
285-
flags: ['--test-reporter=tap'],
292+
flags: ['--test-reporter=tap', '--test-coverage-exclude=!test/**'],
286293
} : false,
287294
process.features.inspector ? {
288295
name: 'test-runner/output/coverage-width-infinity-uncovered-lines.mjs',
289-
flags: ['--test-reporter=tap'],
296+
flags: ['--test-reporter=tap', '--test-coverage-exclude=!test/**'],
290297
} : false,
291298
]
292299
.filter(Boolean)

0 commit comments

Comments
 (0)
Please sign in to comment.