test: fix test-timeout-flag after revert of auto subtest wait · nodejs/node@7cdda92 · GitHub

nodejs / node Public

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

• Code
• Issues 636
• Pull requests 760
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 7cdda92

Browse filesBrowse the repository at this point in the historyBrowse files

pmarchini

authored and

RafaelGSS

committed

test: fix test-timeout-flag after revert of auto subtest wait

PR-URL: #58282 Fixes: #58227 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: LiviaMedeiros <livia@cirno.name>

1 parent dce1995 commit 7cdda92
Copy full SHA for 7cdda92

2 files changed

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

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• test
  • fixtures/test-runner/output
    • test-timeout-flag.js
  • parallel
    • test-runner-output.mjs

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎test/fixtures/test-runner/output/test-timeout-flag.js‎

Copy file name to clipboard

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

Original file line number	Diff line number	Diff line change
@@ -1,19 +1,39 @@
1		- // Flags: --test-timeout=20
2	1	'use strict';
3		- const { describe, test } = require('node:test');
4		- const { setTimeout } = require('node:timers/promises');
	2	+ const { describe, it, after } = require('node:test');
	3	+ const { setTimeout } = require('node:timers');
	4	+
	5	+ const timeoutRefs = [];
5	6
6	7	describe('--test-timeout is set to 20ms', () => {
7		- test('should timeout after 20ms', async () => {
8		- await setTimeout(200000, undefined, { ref: false });
	8	+ it('should timeout after 20ms', async () => {
	9	+ const { promise, resolve } = Promise.withResolvers();
	10	+ timeoutRefs.push(setTimeout(() => {
	11	+ resolve();
	12	+ }, 20000));
	13	+ await promise;
9	14	});
10		- test('should timeout after 5ms', { timeout: 5 }, async () => {
11		- await setTimeout(200000, undefined, { ref: false });
	15	+
	16	+ it('should timeout after 5ms', { timeout: 5 }, async () => {
	17	+ const { promise, resolve } = Promise.withResolvers();
	18	+ timeoutRefs.push(setTimeout(() => {
	19	+ resolve();
	20	+ }, 20000));
	21	+ await promise;
12	22	});
13	23
14		- test('should not timeout', { timeout: 50000 }, async () => {
15		- await setTimeout(1);
	24	+ it('should not timeout', { timeout: 50000 }, async () => {
	25	+ const { promise, resolve } = Promise.withResolvers();
	26	+ timeoutRefs.push(setTimeout(() => {
	27	+ resolve();
	28	+ }, 1));
	29	+ await promise;
16	30	});
17	31
18		- test('should pass', async () => {});
	32	+ it('should pass', async () => {});
	33	+
	34	+ after(() => {
	35	+ for (const timeoutRef of timeoutRefs) {
	36	+ clearTimeout(timeoutRef);
	37	+ }
	38	+ });
19	39	});

Collapse file

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

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

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

Original file line number	Diff line number	Diff line change
@@ -134,12 +134,19 @@ const tests = [
134	134	},
135	135	{
136	136	name: 'test-runner/output/test-timeout-flag.js',
137		- flags: ['--test-reporter=tap'],
	137	+ flags: [
	138	+ '--test-reporter=tap',
	139	+ '--test-timeout=20',
	140	+ ],
138	141	},
139	142	// --test-timeout should work with or without --test flag
140	143	{
141	144	name: 'test-runner/output/test-timeout-flag.js',
142		- flags: ['--test-reporter=tap', '--test'],
	145	+ flags: [
	146	+ '--test-reporter=tap',
	147	+ '--test-timeout=20',
	148	+ '--test',
	149	+ ],
143	150	},
144	151	{
145	152	name: 'test-runner/output/hooks-with-no-global-test.js',

0 commit comments

Comments

0 (0)