Skip to content

Commit

Permalink
testing: fix run incorrectly ending if executed on multiple controllers
Browse files Browse the repository at this point in the history
Fixes (#131827)
  • Loading branch information
connor4312 committed Aug 30, 2021
1 parent f3fbecd commit 604dd14
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
10 changes: 6 additions & 4 deletions src/vs/workbench/api/common/extHostTesting.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import { mapFind } from 'vs/base/common/arrays';
import { VSBuffer } from 'vs/base/common/buffer';
import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
import { Emitter, Event } from 'vs/base/common/event';
import { once } from 'vs/base/common/functional';
import { hash } from 'vs/base/common/hash';
import { Iterable } from 'vs/base/common/iterator';
import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
import { MarshalledId } from 'vs/base/common/marshalling';
import { deepFreeze } from 'vs/base/common/objects';
Expand Down Expand Up @@ -161,14 +161,16 @@ export class ExtHostTesting implements ExtHostTestingShape {
* @inheritdoc
*/
$provideFileCoverage(runId: string, taskId: string, token: CancellationToken): Promise<IFileCoverage[]> {
return Iterable.find(this.runTracker.trackers, t => t.id === runId)?.getCoverage(taskId)?.provideFileCoverage(token) ?? Promise.resolve([]);
const coverage = mapFind(this.runTracker.trackers, t => t.id === runId ? t.getCoverage(taskId) : undefined);
return coverage?.provideFileCoverage(token) ?? Promise.resolve([]);
}

/**
* @inheritdoc
*/
$resolveFileCoverage(runId: string, taskId: string, fileIndex: number, token: CancellationToken): Promise<CoverageDetails[]> {
return Iterable.find(this.runTracker.trackers, t => t.id === runId)?.getCoverage(taskId)?.resolveFileCoverage(fileIndex, token) ?? Promise.resolve([]);
const coverage = mapFind(this.runTracker.trackers, t => t.id === runId ? t.getCoverage(taskId) : undefined);
return coverage?.resolveFileCoverage(fileIndex, token) ?? Promise.resolve([]);
}

/** @inheritdoc */
Expand Down Expand Up @@ -263,7 +265,7 @@ export class ExtHostTesting implements ExtHostTestingShape {
await Event.toPromise(tracker.onEnd);
}

this.runTracker.cancelRunById(req.runId);
tracker.dispose();
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/vs/workbench/contrib/testing/common/testingStates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ export const statePriority: { [K in TestResultState]: number } = {
[TestResultState.Running]: 6,
[TestResultState.Errored]: 5,
[TestResultState.Failed]: 4,
[TestResultState.Queued]: 3,
[TestResultState.Passed]: 2,
[TestResultState.Passed]: 3,
[TestResultState.Queued]: 2,
[TestResultState.Unset]: 1,
[TestResultState.Skipped]: 0,
};
Expand Down

0 comments on commit 604dd14

Please sign in to comment.