Skip to content

Commit 9f0b82e

Browse files
authored
Disable exp in extension tests (microsoft#204175)
1 parent 327c89a commit 9f0b82e

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/vs/platform/assignment/common/assignmentService.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { IProductService } from 'vs/platform/product/common/productService';
1010
import { getTelemetryLevel } from 'vs/platform/telemetry/common/telemetryUtils';
1111
import { AssignmentFilterProvider, ASSIGNMENT_REFETCH_INTERVAL, ASSIGNMENT_STORAGE_KEY, IAssignmentService, TargetPopulation } from 'vs/platform/assignment/common/assignment';
1212
import { importAMDNodeModule } from 'vs/amdX';
13+
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
1314

1415
export abstract class BaseAssignmentService implements IAssignmentService {
1516
_serviceBrand: undefined;
@@ -25,11 +26,12 @@ export abstract class BaseAssignmentService implements IAssignmentService {
2526
private readonly machineId: string,
2627
protected readonly configurationService: IConfigurationService,
2728
protected readonly productService: IProductService,
29+
protected readonly environmentService: IEnvironmentService,
2830
protected telemetry: IExperimentationTelemetry,
2931
private keyValueStorage?: IKeyValueStorage
3032
) {
31-
32-
if (productService.tasConfig && this.experimentsEnabled && getTelemetryLevel(this.configurationService) === TelemetryLevel.USAGE) {
33+
const isTesting = environmentService.extensionTestsLocationURI !== undefined;
34+
if (!isTesting && productService.tasConfig && this.experimentsEnabled && getTelemetryLevel(this.configurationService) === TelemetryLevel.USAGE) {
3335
this.tasClient = this.setupTASClient();
3436
}
3537

src/vs/workbench/services/assignment/common/assignmentService.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
1818
import { BaseAssignmentService } from 'vs/platform/assignment/common/assignmentService';
1919
import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
2020
import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
21+
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
2122

2223
export const IWorkbenchAssignmentService = createDecorator<IWorkbenchAssignmentService>('WorkbenchAssignmentService');
2324

@@ -84,13 +85,15 @@ export class WorkbenchAssignmentService extends BaseAssignmentService {
8485
@ITelemetryService private telemetryService: ITelemetryService,
8586
@IStorageService storageService: IStorageService,
8687
@IConfigurationService configurationService: IConfigurationService,
87-
@IProductService productService: IProductService
88+
@IProductService productService: IProductService,
89+
@IEnvironmentService environmentService: IEnvironmentService
8890
) {
8991

9092
super(
9193
telemetryService.machineId,
9294
configurationService,
9395
productService,
96+
environmentService,
9497
new WorkbenchAssignmentServiceTelemetry(telemetryService, productService),
9598
new MementoKeyValueStorage(new Memento('experiment.service.memento', storageService))
9699
);

0 commit comments

Comments
 (0)