test_runner,test: fix flaky test-runner-cli-concurrency.js · nodejs/node@4b2e258 · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 635
• Pull requests 756
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 4b2e258

Browse filesBrowse the repository at this point in the historyBrowse files

cjihrig

authored and

targos

committed

test_runner,test: fix flaky test-runner-cli-concurrency.js

This test was flaky on Windows when trying to clean up the tmp directory, probably because it relied on child processes timing out and being killed. This commit updates the test to check for debug output from the test runner. This should be adequate because the original change was effectively: let concurrency = getOptionValue('--test-concurrency') || true; The test runner now logs the value of the concurrency variable. Fixes: #50101 PR-URL: #50108 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>

1 parent 428301a commit 4b2e258
Copy full SHA for 4b2e258

2 files changed

+30-39Lines changed: 30 additions & 39 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib/internal/main
  • test_runner.js
• test/parallel
  • test-runner-cli-concurrency.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/internal/main/test_runner.js‎

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

+12-2Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -17,6 +17,9 @@ const {
17	17	RegExpPrototypeExec,
18	18	StringPrototypeSplit,
19	19	} = primordials;
	20	+ let debug = require('internal/util/debuglog').debuglog('test_runner', (fn) => {
	21	+ debug = fn;
	22	+ });
20	23
21	24	prepareMainThreadExecution(false);
22	25	markBootstrapComplete();
@@ -56,8 +59,15 @@ if (shardOption) {
56	59	};
57	60	}
58	61
59		- run({ concurrency, inspectPort, watch: getOptionValue('--watch'), setup: setupTestReporters, shard })
60		- .on('test:fail', (data) => {
	62	+ const options = {
	63	+ concurrency,
	64	+ inspectPort,
	65	+ watch: getOptionValue('--watch'),
	66	+ setup: setupTestReporters,
	67	+ shard,
	68	+ };
	69	+ debug('test runner configuration:', options);
	70	+ run(options).on('test:fail', (data) => {
61	71	if (data.todo === undefined || data.todo === false) {
62	72	process.exitCode = 1;
63	73	}

Collapse file

‎test/parallel/test-runner-cli-concurrency.js‎

Copy file name to clipboard

+18-37Lines changed: 18 additions & 37 deletions

Original file line number	Diff line number	Diff line change
@@ -1,45 +1,26 @@
1	1	'use strict';
2		- const common = require('../common');
3		- const tmpdir = require('../common/tmpdir');
4		- const { deepStrictEqual, strictEqual } = require('node:assert');
	2	+ require('../common');
	3	+ const fixtures = require('../common/fixtures');
	4	+ const assert = require('node:assert');
5	5	const { spawnSync } = require('node:child_process');
6		- const { readdirSync, writeFileSync } = require('node:fs');
7		- const { join } = require('node:path');
8		- const { beforeEach, test } = require('node:test');
	6	+ const { test } = require('node:test');
	7	+ const cwd = fixtures.path('test-runner', 'default-behavior');
	8	+ const env = { ...process.env, 'NODE_DEBUG': 'test_runner' };
9	9
10		- function createTestFile(name) {
11		- writeFileSync(join(tmpdir.path, name), `
12		- const fs = require('node:fs');
13		-
14		- fs.unlinkSync(__filename);
15		- setTimeout(() => {}, 1_000_000_000);
16		- `);
17		- }
18		-
19		- beforeEach(() => {
20		- tmpdir.refresh();
21		- createTestFile('test-1.js');
22		- createTestFile('test-2.js');
	10	+ test('default concurrency', async () => {
	11	+ const args = ['--test'];
	12	+ const cp = spawnSync(process.execPath, args, { cwd, env });
	13	+ assert.match(cp.stderr.toString(), /concurrency: true,/);
23	14	});
24	15
25		- test('concurrency of one', () => {
26		- const cp = spawnSync(process.execPath, ['--test', '--test-concurrency=1'], {
27		- cwd: tmpdir.path,
28		- timeout: common.platformTimeout(1000),
29		- });
30		-
31		- strictEqual(cp.stderr.toString(), '');
32		- strictEqual(cp.error.code, 'ETIMEDOUT');
33		- deepStrictEqual(readdirSync(tmpdir.path), ['test-2.js']);
	16	+ test('concurrency of one', async () => {
	17	+ const args = ['--test', '--test-concurrency=1'];
	18	+ const cp = spawnSync(process.execPath, args, { cwd, env });
	19	+ assert.match(cp.stderr.toString(), /concurrency: 1,/);
34	20	});
35	21
36		- test('concurrency of two', () => {
37		- const cp = spawnSync(process.execPath, ['--test', '--test-concurrency=2'], {
38		- cwd: tmpdir.path,
39		- timeout: common.platformTimeout(1000),
40		- });
41		-
42		- strictEqual(cp.stderr.toString(), '');
43		- strictEqual(cp.error.code, 'ETIMEDOUT');
44		- deepStrictEqual(readdirSync(tmpdir.path), []);
	22	+ test('concurrency of two', async () => {
	23	+ const args = ['--test', '--test-concurrency=2'];
	24	+ const cp = spawnSync(process.execPath, args, { cwd, env });
	25	+ assert.match(cp.stderr.toString(), /concurrency: 2,/);
45	26	});

0 commit comments

Comments

0 (0)