Skip to content

Commit 75d48f8

Browse files
authored
testing: another fix to avoid automatically queuing (microsoft#181160)
Fixes microsoft#180041 again
1 parent 3473f38 commit 75d48f8

File tree

2 files changed

+12
-20
lines changed

2 files changed

+12
-20
lines changed

src/vs/workbench/contrib/testing/common/testResult.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -367,10 +367,6 @@ export class LiveTestResult implements ITestResult {
367367
parent = this.addTestToRun(controllerId, chain[i], parent.item.extId);
368368
}
369369

370-
for (let i = 0; i < this.tasks.length; i++) {
371-
this.fireUpdateAndRefresh(parent, i, TestResultState.Queued);
372-
}
373-
374370
return undefined;
375371
}
376372

src/vs/workbench/contrib/testing/test/common/testResultService.test.ts

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServic
2020
suite('Workbench - Test Results Service', () => {
2121
const getLabelsIn = (it: Iterable<TestResultItem>) => [...it].map(t => t.item.label).sort();
2222
const getChangeSummary = () => [...changed]
23-
.map(c => ({ reason: c.reason, label: c.item.item.label }))
24-
.sort((a, b) => a.label.localeCompare(b.label));
23+
.map(c => ({ reason: c.reason, label: c.item.item.label }));
2524

2625
let r: TestLiveTestResult;
2726
let changed = new Set<TestResultItemChange>();
@@ -85,13 +84,8 @@ suite('Workbench - Test Results Service', () => {
8584
).tests), []);
8685
});
8786

88-
test('initially queues with update', () => {
89-
assert.deepStrictEqual(getChangeSummary(), [
90-
{ label: 'a', reason: TestResultItemChangeReason.ComputedStateChange },
91-
{ label: 'aa', reason: TestResultItemChangeReason.OwnStateChange },
92-
{ label: 'ab', reason: TestResultItemChangeReason.OwnStateChange },
93-
{ label: 'root', reason: TestResultItemChangeReason.ComputedStateChange },
94-
]);
87+
test('initially queues nothing', () => {
88+
assert.deepStrictEqual(getChangeSummary(), []);
9589
});
9690

9791
test('initializes with the subtree of requested tests', () => {
@@ -101,8 +95,7 @@ suite('Workbench - Test Results Service', () => {
10195
test('initializes with valid counts', () => {
10296
assert.deepStrictEqual(r.counts, {
10397
...makeEmptyCounts(),
104-
[TestResultState.Queued]: 2,
105-
[TestResultState.Unset]: 2,
98+
[TestResultState.Unset]: 4,
10699
});
107100
});
108101

@@ -126,9 +119,14 @@ suite('Workbench - Test Results Service', () => {
126119
assert.deepStrictEqual(r.getStateById(new TestId(['ctrlId', 'id-a']).toString())?.tasks[0].state, TestResultState.Failed);
127120
assert.deepStrictEqual(getChangeSummary(), [
128121
{ label: 'a', reason: TestResultItemChangeReason.OwnStateChange },
122+
{ label: 'root', reason: TestResultItemChangeReason.ComputedStateChange },
129123
{ label: 'aa', reason: TestResultItemChangeReason.OwnStateChange },
130124
{ label: 'ab', reason: TestResultItemChangeReason.OwnStateChange },
125+
126+
{ label: 'a', reason: TestResultItemChangeReason.OwnStateChange },
131127
{ label: 'root', reason: TestResultItemChangeReason.ComputedStateChange },
128+
{ label: 'aa', reason: TestResultItemChangeReason.OwnStateChange },
129+
{ label: 'ab', reason: TestResultItemChangeReason.OwnStateChange },
132130
]);
133131
});
134132

@@ -138,16 +136,15 @@ suite('Workbench - Test Results Service', () => {
138136
r.updateState(testId, 't', TestResultState.Running);
139137
assert.deepStrictEqual(r.counts, {
140138
...makeEmptyCounts(),
141-
[TestResultState.Unset]: 2,
139+
[TestResultState.Unset]: 3,
142140
[TestResultState.Running]: 1,
143-
[TestResultState.Queued]: 1,
144141
});
145142
assert.deepStrictEqual(r.getStateById(testId)?.ownComputedState, TestResultState.Running);
146143
// update computed state:
147144
assert.deepStrictEqual(r.getStateById(tests.root.id)?.computedState, TestResultState.Running);
148145
assert.deepStrictEqual(getChangeSummary(), [
149-
{ label: 'a', reason: TestResultItemChangeReason.ComputedStateChange },
150146
{ label: 'aa', reason: TestResultItemChangeReason.OwnStateChange },
147+
{ label: 'a', reason: TestResultItemChangeReason.ComputedStateChange },
151148
{ label: 'root', reason: TestResultItemChangeReason.ComputedStateChange },
152149
]);
153150

@@ -166,8 +163,7 @@ suite('Workbench - Test Results Service', () => {
166163
r.updateState(new TestId(['ctrlId', 'id-b']).toString(), 't', TestResultState.Running);
167164
assert.deepStrictEqual(r.counts, {
168165
...makeEmptyCounts(),
169-
[TestResultState.Queued]: 2,
170-
[TestResultState.Unset]: 2,
166+
[TestResultState.Unset]: 4,
171167
});
172168
assert.deepStrictEqual(r.getStateById(new TestId(['ctrlId', 'id-b']).toString()), undefined);
173169
});

0 commit comments

Comments
 (0)