FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

test_runner: pass FORCE_COLOR to child process · nodejs/node@750d3e8 · GitHub

/ node Public

Commit 750d3e8

Browse files
MoLow
authored and
targos
committed
test_runner: pass FORCE_COLOR to child process
PR-URL: #48057 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 3278542 commit 750d3e8

7 files changed

Lines changed: 65 additions & 4 deletions

File tree

‎lib/internal/test_runner/harness.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ function setup(root) {
179179
topLevel: 0,
180180
suites: 0,
181181
},
182+
shouldColorizeTestFiles: false,
182183
};
183184
root.startTime = hrtime();
184185
return root;

‎lib/internal/test_runner/runner.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,9 @@ function runTestFile(path, root, inspectPort, filesWatcher, testNamePatterns) {
347347
stdio.push('ipc');
348348
env.WATCH_REPORT_DEPENDENCIES = '1';
349349
}
350+
if (root.harness.shouldColorizeTestFiles) {
351+
env.FORCE_COLOR = '1';
352+
}
350353

351354
const child = spawn(process.execPath, args, { signal: t.signal, encoding: 'utf8', env, stdio });
352355
runningProcesses.set(path, child);

‎lib/internal/test_runner/utils.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const { createWriteStream } = require('fs');
1616
const { pathToFileURL } = require('internal/url');
1717
const { createDeferredPromise } = require('internal/util');
1818
const { getOptionValue } = require('internal/options');
19-
const { green, red, white } = require('internal/util/colors');
19+
const { green, red, white, shouldColorize } = require('internal/util/colors');
2020

2121
const {
2222
codes: {
@@ -115,9 +115,10 @@ function tryBuiltinReporter(name) {
115115
return require(builtinPath);
116116
}
117117

118-
async function getReportersMap(reporters, destinations) {
118+
async function getReportersMap(reporters, destinations, rootTest) {
119119
return SafePromiseAllReturnArrayLike(reporters, async (name, i) => {
120120
const destination = kBuiltinDestinations.get(destinations[i]) ?? createWriteStream(destinations[i]);
121+
rootTest.harness.shouldColorizeTestFiles ||= shouldColorize(destination);
121122

122123
// Load the test reporter passed to --test-reporter
123124
let reporter = tryBuiltinReporter(name);
@@ -154,7 +155,7 @@ async function getReportersMap(reporters, destinations) {
154155

155156
async function setupTestReporters(rootTest) {
156157
const { reporters, destinations } = parseCommandLine();
157-
const reportersMap = await getReportersMap(reporters, destinations);
158+
const reportersMap = await getReportersMap(reporters, destinations, rootTest);
158159
for (let i = 0; i < reportersMap.length; i++) {
159160
const { reporter, destination } = reportersMap[i];
160161
compose(rootTest.reporter, reporter).pipe(destination);

‎test/fixtures/test-runner/output/arbitrary-output-colored-1.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
'use strict';
2+
3+
const test = require('node:test');
4+
console.log({ foo: 'bar' });
5+
test('passing test', () => {
6+
console.log(1);
7+
});

‎test/fixtures/test-runner/output/arbitrary-output-colored.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
'use strict';
2+
const common = require('../../../common');
3+
const { once } = require('node:events');
4+
const { spawn } = require('node:child_process');
5+
const fixtures = require('../../../common/fixtures');
6+
7+
(async function run() {
8+
const test = fixtures.path('test-runner/output/arbitrary-output-colored-1.js');
9+
await once(spawn(process.execPath, ['--test', test], { stdio: 'inherit', env: { FORCE_COLOR: 1 } }), 'exit');
10+
await once(spawn(process.execPath, ['--test', '--test-reporter', 'tap', test], { stdio: 'inherit', env: { FORCE_COLOR: 1 } }), 'exit');
11+
})().then(common.mustCall());

‎test/fixtures/test-runner/output/arbitrary-output-colored.snapshot‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{ foo: [32m'bar'[39m }
2+
[33m1[39m
3+
[32m✔ passing test [90m(*ms)[39m[39m
4+
[34mℹ tests 1[39m
5+
[34mℹ suites 0[39m
6+
[34mℹ pass 1[39m
7+
[34mℹ fail 0[39m
8+
[34mℹ cancelled 0[39m
9+
[34mℹ skipped 0[39m
10+
[34mℹ todo 0[39m
11+
[34mℹ duration_ms *[39m
12+
TAP version 13
13+
# { foo: [32m'bar'[39m }
14+
# [33m1[39m
15+
# Subtest: passing test
16+
ok 1 - passing test
17+
---
18+
duration_ms: *
19+
...
20+
1..1
21+
# tests 1
22+
# suites 0
23+
# pass 1
24+
# fail 0
25+
# cancelled 0
26+
# skipped 0
27+
# todo 0
28+
# duration_ms *

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ import * as fixtures from '../common/fixtures.mjs';
33
import * as snapshot from '../common/assertSnapshot.js';
44
import { describe, it } from 'node:test';
55

6+
const skipForceColors =
7+
process.config.variables.icu_gyp_path !== 'tools/icu/icu-generic.gyp' ||
8+
process.config.variables.node_shared_openssl;
9+
610
function replaceTestDuration(str) {
711
return str
812
.replaceAll(/duration_ms: 0(\r?\n)/g, 'duration_ms: ZERO$1')
@@ -46,8 +50,14 @@ const tests = [
4650
{ name: 'test-runner/output/unresolved_promise.js' },
4751
{ name: 'test-runner/output/default_output.js', transform: specTransform, tty: true },
4852
{ name: 'test-runner/output/arbitrary-output.js' },
53+
!skipForceColors ? {
54+
name: 'test-runner/output/arbitrary-output-colored.js',
55+
transform: snapshot.transform(specTransform, replaceTestDuration), tty: true
56+
} : false,
4957
{ name: 'test-runner/output/dot_output_custom_columns.js', transform: specTransform, tty: true },
50-
].map(({ name, tty, transform }) => ({
58+
]
59+
.filter(Boolean)
60+
.map(({ name, tty, transform }) => ({
5161
name,
5262
fn: common.mustCall(async () => {
5363
await snapshot.spawnAndAssert(fixtures.path(name), transform ?? defaultTransform, { tty });

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL