Skip to content

Commit cd9a8ee

Browse files
pmarchinipmarchini
committed
test_runner: cover randomized first subtest draw
1 parent d013ca5 commit cd9a8ee

File tree

7 files changed

+231
-161
lines changed

7 files changed

+231
-161
lines changed

‎lib/internal/test_runner/runner.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,6 @@ function run(options = kEmptyObject) {
853853
const { isTestRunner } = globalOptions;
854854

855855
if (randomize) {
856-
testFiles = shuffleArrayWithSeed(testFiles, randomSeed);
857856
root.diagnostic(`Randomized test order seed: ${randomSeed}`);
858857
}
859858

‎lib/internal/test_runner/test.js‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -696,6 +696,7 @@ class Test extends AsyncResource {
696696
createSeededGenerator(this.config.randomSeed) :
697697
null;
698698
this.pendingSubtests = [];
699+
this.pendingSubtestsScheduled = false;
699700
this.readySubtests = new SafeMap();
700701
this.unfinishedSubtests = new SafeSet();
701702
this.subtestsPromise = null;
@@ -827,6 +828,18 @@ class Test extends AsyncResource {
827828
ArrayPrototypePush(this.pendingSubtests, deferred);
828829
}
829830

831+
schedulePendingSubtests() {
832+
if (this.pendingSubtestsScheduled) {
833+
return;
834+
}
835+
836+
this.pendingSubtestsScheduled = true;
837+
queueMicrotask(() => {
838+
this.pendingSubtestsScheduled = false;
839+
this.processPendingSubtests();
840+
});
841+
}
842+
830843
/**
831844
* Ensure each subtest has a contiguous, per-parent reporting order.
832845
* This is assigned at dequeue time for randomized runs, but tests that are
@@ -1124,6 +1137,19 @@ class Test extends AsyncResource {
11241137
return deferred.promise;
11251138
}
11261139

1140+
// When this parent dequeues subtests through subtestQueueRandom, defer the
1141+
// first start to the next microtask so siblings created in the same
1142+
// synchronous turn are all eligible for the first randomized pick, rather
1143+
// than letting declaration order claim the initial concurrency slot(s).
1144+
if (this.parent.subtestQueueRandom) {
1145+
const deferred = PromiseWithResolvers();
1146+
1147+
setOwnProperty(deferred, 'test', this);
1148+
this.parent.addPendingSubtest(deferred);
1149+
this.parent.schedulePendingSubtests();
1150+
return deferred.promise;
1151+
}
1152+
11271153
this.parent.assignReportOrder(this);
11281154
this.reporter.dequeue(this.nesting, this.loc, this.name, this.reportedType);
11291155
return this.run();

‎test/fixtures/test-runner/output/randomize_nested_scenarios_output_cli_none.snapshot‎

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,112 @@
11
▶ nested-scenarios
22
▶ scenario describe-it
33
▶ describe-it block
4+
▶ describe-it 2
5+
▶ describe-it 2-2
6+
✔ describe-it 2-2-2 (*ms)
7+
✔ describe-it 2-2-1 (*ms)
8+
✔ describe-it 2-2-3 (*ms)
9+
✔ describe-it 2-2 (*ms)
10+
▶ describe-it 2-1
11+
✔ describe-it 2-1-2 (*ms)
12+
✔ describe-it 2-1-1 (*ms)
13+
✔ describe-it 2-1-3 (*ms)
14+
✔ describe-it 2-1 (*ms)
15+
▶ describe-it 2-3
16+
✔ describe-it 2-3-2 (*ms)
17+
✔ describe-it 2-3-1 (*ms)
18+
✔ describe-it 2-3-3 (*ms)
19+
✔ describe-it 2-3 (*ms)
20+
✔ describe-it 2 (*ms)
421
▶ describe-it 1
22+
▶ describe-it 1-2
23+
✔ describe-it 1-2-2 (*ms)
24+
✔ describe-it 1-2-1 (*ms)
25+
✔ describe-it 1-2-3 (*ms)
26+
✔ describe-it 1-2 (*ms)
527
▶ describe-it 1-1
28+
✔ describe-it 1-1-2 (*ms)
629
✔ describe-it 1-1-1 (*ms)
730
✔ describe-it 1-1-3 (*ms)
8-
✔ describe-it 1-1-2 (*ms)
931
✔ describe-it 1-1 (*ms)
1032
▶ describe-it 1-3
33+
✔ describe-it 1-3-2 (*ms)
1134
✔ describe-it 1-3-1 (*ms)
1235
✔ describe-it 1-3-3 (*ms)
13-
✔ describe-it 1-3-2 (*ms)
1436
✔ describe-it 1-3 (*ms)
15-
▶ describe-it 1-2
16-
✔ describe-it 1-2-1 (*ms)
17-
✔ describe-it 1-2-3 (*ms)
18-
✔ describe-it 1-2-2 (*ms)
19-
✔ describe-it 1-2 (*ms)
2037
✔ describe-it 1 (*ms)
2138
▶ describe-it 3
39+
▶ describe-it 3-2
40+
✔ describe-it 3-2-2 (*ms)
41+
✔ describe-it 3-2-1 (*ms)
42+
✔ describe-it 3-2-3 (*ms)
43+
✔ describe-it 3-2 (*ms)
2244
▶ describe-it 3-1
45+
✔ describe-it 3-1-2 (*ms)
2346
✔ describe-it 3-1-1 (*ms)
2447
✔ describe-it 3-1-3 (*ms)
25-
✔ describe-it 3-1-2 (*ms)
2648
✔ describe-it 3-1 (*ms)
2749
▶ describe-it 3-3
50+
✔ describe-it 3-3-2 (*ms)
2851
✔ describe-it 3-3-1 (*ms)
2952
✔ describe-it 3-3-3 (*ms)
30-
✔ describe-it 3-3-2 (*ms)
3153
✔ describe-it 3-3 (*ms)
32-
▶ describe-it 3-2
33-
✔ describe-it 3-2-1 (*ms)
34-
✔ describe-it 3-2-3 (*ms)
35-
✔ describe-it 3-2-2 (*ms)
36-
✔ describe-it 3-2 (*ms)
3754
✔ describe-it 3 (*ms)
38-
▶ describe-it 2
39-
▶ describe-it 2-1
40-
✔ describe-it 2-1-1 (*ms)
41-
✔ describe-it 2-1-3 (*ms)
42-
✔ describe-it 2-1-2 (*ms)
43-
✔ describe-it 2-1 (*ms)
44-
▶ describe-it 2-3
45-
✔ describe-it 2-3-1 (*ms)
46-
✔ describe-it 2-3-3 (*ms)
47-
✔ describe-it 2-3-2 (*ms)
48-
✔ describe-it 2-3 (*ms)
49-
▶ describe-it 2-2
50-
✔ describe-it 2-2-1 (*ms)
51-
✔ describe-it 2-2-3 (*ms)
52-
✔ describe-it 2-2-2 (*ms)
53-
✔ describe-it 2-2 (*ms)
54-
✔ describe-it 2 (*ms)
5555
✔ describe-it block (*ms)
5656
✔ scenario describe-it (*ms)
5757
▶ scenario static-no-await
5858
▶ static-no-await block
59+
▶ static-no-await 2
60+
▶ static-no-await 2-2
61+
✔ static-no-await 2-2-2 (*ms)
62+
✔ static-no-await 2-2-1 (*ms)
63+
✔ static-no-await 2-2-3 (*ms)
64+
✔ static-no-await 2-2 (*ms)
65+
▶ static-no-await 2-1
66+
✔ static-no-await 2-1-2 (*ms)
67+
✔ static-no-await 2-1-1 (*ms)
68+
✔ static-no-await 2-1-3 (*ms)
69+
✔ static-no-await 2-1 (*ms)
70+
▶ static-no-await 2-3
71+
✔ static-no-await 2-3-2 (*ms)
72+
✔ static-no-await 2-3-1 (*ms)
73+
✔ static-no-await 2-3-3 (*ms)
74+
✔ static-no-await 2-3 (*ms)
75+
✔ static-no-await 2 (*ms)
5976
▶ static-no-await 1
77+
▶ static-no-await 1-2
78+
✔ static-no-await 1-2-2 (*ms)
79+
✔ static-no-await 1-2-1 (*ms)
80+
✔ static-no-await 1-2-3 (*ms)
81+
✔ static-no-await 1-2 (*ms)
6082
▶ static-no-await 1-1
83+
✔ static-no-await 1-1-2 (*ms)
6184
✔ static-no-await 1-1-1 (*ms)
6285
✔ static-no-await 1-1-3 (*ms)
63-
✔ static-no-await 1-1-2 (*ms)
6486
✔ static-no-await 1-1 (*ms)
6587
▶ static-no-await 1-3
88+
✔ static-no-await 1-3-2 (*ms)
6689
✔ static-no-await 1-3-1 (*ms)
6790
✔ static-no-await 1-3-3 (*ms)
68-
✔ static-no-await 1-3-2 (*ms)
6991
✔ static-no-await 1-3 (*ms)
70-
▶ static-no-await 1-2
71-
✔ static-no-await 1-2-1 (*ms)
72-
✔ static-no-await 1-2-3 (*ms)
73-
✔ static-no-await 1-2-2 (*ms)
74-
✔ static-no-await 1-2 (*ms)
7592
✔ static-no-await 1 (*ms)
7693
▶ static-no-await 3
94+
▶ static-no-await 3-2
95+
✔ static-no-await 3-2-2 (*ms)
96+
✔ static-no-await 3-2-1 (*ms)
97+
✔ static-no-await 3-2-3 (*ms)
98+
✔ static-no-await 3-2 (*ms)
7799
▶ static-no-await 3-1
100+
✔ static-no-await 3-1-2 (*ms)
78101
✔ static-no-await 3-1-1 (*ms)
79102
✔ static-no-await 3-1-3 (*ms)
80-
✔ static-no-await 3-1-2 (*ms)
81103
✔ static-no-await 3-1 (*ms)
82104
▶ static-no-await 3-3
105+
✔ static-no-await 3-3-2 (*ms)
83106
✔ static-no-await 3-3-1 (*ms)
84107
✔ static-no-await 3-3-3 (*ms)
85-
✔ static-no-await 3-3-2 (*ms)
86108
✔ static-no-await 3-3 (*ms)
87-
▶ static-no-await 3-2
88-
✔ static-no-await 3-2-1 (*ms)
89-
✔ static-no-await 3-2-3 (*ms)
90-
✔ static-no-await 3-2-2 (*ms)
91-
✔ static-no-await 3-2 (*ms)
92109
✔ static-no-await 3 (*ms)
93-
▶ static-no-await 2
94-
▶ static-no-await 2-1
95-
✔ static-no-await 2-1-1 (*ms)
96-
✔ static-no-await 2-1-3 (*ms)
97-
✔ static-no-await 2-1-2 (*ms)
98-
✔ static-no-await 2-1 (*ms)
99-
▶ static-no-await 2-3
100-
✔ static-no-await 2-3-1 (*ms)
101-
✔ static-no-await 2-3-3 (*ms)
102-
✔ static-no-await 2-3-2 (*ms)
103-
✔ static-no-await 2-3 (*ms)
104-
▶ static-no-await 2-2
105-
✔ static-no-await 2-2-1 (*ms)
106-
✔ static-no-await 2-2-3 (*ms)
107-
✔ static-no-await 2-2-2 (*ms)
108-
✔ static-no-await 2-2 (*ms)
109-
✔ static-no-await 2 (*ms)
110110
✔ static-no-await block (*ms)
111111
✔ scenario static-no-await (*ms)
112112
▶ scenario static-await
@@ -166,39 +166,39 @@
166166
✔ scenario static-await (*ms)
167167
▶ scenario mixed-await-normal
168168
▶ mixed-await-normal block
169+
▶ mixed-await-normal 2
170+
✔ mixed-await-normal 2-1-awaited (*ms)
171+
✔ mixed-await-normal 2-1-sync-before (*ms)
172+
✔ mixed-await-normal 2-1-sync-after (*ms)
173+
✔ mixed-await-normal 2-2-awaited (*ms)
174+
✔ mixed-await-normal 2-2-sync-before (*ms)
175+
✔ mixed-await-normal 2-3-awaited (*ms)
176+
✔ mixed-await-normal 2-3-sync-before (*ms)
177+
✔ mixed-await-normal 2-2-sync-after (*ms)
178+
✔ mixed-await-normal 2-3-sync-after (*ms)
179+
✔ mixed-await-normal 2 (*ms)
169180
▶ mixed-await-normal 1
170-
✔ mixed-await-normal 1-1-sync-before (*ms)
171181
✔ mixed-await-normal 1-1-awaited (*ms)
182+
✔ mixed-await-normal 1-1-sync-before (*ms)
172183
✔ mixed-await-normal 1-1-sync-after (*ms)
173184
✔ mixed-await-normal 1-2-awaited (*ms)
174185
✔ mixed-await-normal 1-2-sync-before (*ms)
175-
✔ mixed-await-normal 1-2-sync-after (*ms)
176186
✔ mixed-await-normal 1-3-awaited (*ms)
177187
✔ mixed-await-normal 1-3-sync-before (*ms)
188+
✔ mixed-await-normal 1-2-sync-after (*ms)
178189
✔ mixed-await-normal 1-3-sync-after (*ms)
179190
✔ mixed-await-normal 1 (*ms)
180191
▶ mixed-await-normal 3
181-
✔ mixed-await-normal 3-1-sync-before (*ms)
182192
✔ mixed-await-normal 3-1-awaited (*ms)
193+
✔ mixed-await-normal 3-1-sync-before (*ms)
183194
✔ mixed-await-normal 3-1-sync-after (*ms)
184195
✔ mixed-await-normal 3-2-awaited (*ms)
185196
✔ mixed-await-normal 3-2-sync-before (*ms)
186-
✔ mixed-await-normal 3-2-sync-after (*ms)
187197
✔ mixed-await-normal 3-3-awaited (*ms)
188198
✔ mixed-await-normal 3-3-sync-before (*ms)
199+
✔ mixed-await-normal 3-2-sync-after (*ms)
189200
✔ mixed-await-normal 3-3-sync-after (*ms)
190201
✔ mixed-await-normal 3 (*ms)
191-
▶ mixed-await-normal 2
192-
✔ mixed-await-normal 2-1-sync-before (*ms)
193-
✔ mixed-await-normal 2-1-awaited (*ms)
194-
✔ mixed-await-normal 2-1-sync-after (*ms)
195-
✔ mixed-await-normal 2-2-awaited (*ms)
196-
✔ mixed-await-normal 2-2-sync-before (*ms)
197-
✔ mixed-await-normal 2-2-sync-after (*ms)
198-
✔ mixed-await-normal 2-3-awaited (*ms)
199-
✔ mixed-await-normal 2-3-sync-before (*ms)
200-
✔ mixed-await-normal 2-3-sync-after (*ms)
201-
✔ mixed-await-normal 2 (*ms)
202202
✔ mixed-await-normal block (*ms)
203203
✔ scenario mixed-await-normal (*ms)
204204
✔ nested-scenarios (*ms)

0 commit comments

Comments
 (0)