Skip to content

Commit 8535dbc

Browse files
author
Kartik Raj
committed
Remove all traces of experiment
1 parent e73d548 commit 8535dbc

File tree

3 files changed

+3
-25
lines changed

3 files changed

+3
-25
lines changed

src/client/common/experiments/groups.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@ export enum ShowExtensionSurveyPrompt {
33
experiment = 'pythonSurveyNotification',
44
}
55

6-
/*
7-
* Experiment to check whether the extension should deprecate `python.pythonPath` setting
8-
*/
9-
export enum DeprecatePythonPath {
10-
experiment = 'pythonDeprecatePythonPath',
11-
}
12-
136
// Feature flag for 'Python: Launch TensorBoard' feature
147
export enum NativeTensorBoard {
158
experiment = 'pythonTensorboardExperiment',

src/test/common/terminals/environmentActivationProviders/terminalActivation.testvirtualenvs.ts

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,18 @@ import * as fs from 'fs-extra';
88
import * as path from 'path';
99
import * as sinon from 'sinon';
1010
import * as vscode from 'vscode';
11-
import { DeprecatePythonPath } from '../../../../client/common/experiments/groups';
1211
import { FileSystem } from '../../../../client/common/platform/fileSystem';
13-
import { IExperimentService } from '../../../../client/common/types';
1412
import { PYTHON_VIRTUAL_ENVS_LOCATION } from '../../../ciConstants';
1513
import {
1614
PYTHON_PATH,
1715
resetGlobalInterpreterPathSetting,
18-
restorePythonPathInWorkspaceRoot,
1916
setGlobalInterpreterPath,
20-
setPythonPathInWorkspaceRoot,
2117
updateSetting,
2218
waitForCondition,
2319
} from '../../../common';
2420
import { EXTENSION_ROOT_DIR_FOR_TESTS, TEST_TIMEOUT } from '../../../constants';
2521
import { sleep } from '../../../core';
26-
import { initialize, initializeTest } from '../../../initialize';
22+
import { initializeTest } from '../../../initialize';
2723

2824
suite('Activation of Environments in Terminal', () => {
2925
const file = path.join(
@@ -57,7 +53,6 @@ suite('Activation of Environments in Terminal', () => {
5753
};
5854
let terminalSettings: any;
5955
let pythonSettings: any;
60-
let experiments: IExperimentService;
6156
const sandbox = sinon.createSandbox();
6257
suiteSetup(async () => {
6358
envPaths = await fs.readJson(envsLocation);
@@ -66,7 +61,6 @@ suite('Activation of Environments in Terminal', () => {
6661
defaultShell.Windows = terminalSettings.inspect('integrated.defaultProfile.windows').globalValue;
6762
defaultShell.Linux = terminalSettings.inspect('integrated.defaultProfile.linux').globalValue;
6863
await terminalSettings.update('integrated.defaultProfile.linux', 'bash', vscode.ConfigurationTarget.Global);
69-
experiments = (await initialize()).serviceContainer.get<IExperimentService>(IExperimentService);
7064
});
7165

7266
setup(async () => {
@@ -113,11 +107,7 @@ suite('Activation of Environments in Terminal', () => {
113107
vscode.ConfigurationTarget.Global,
114108
);
115109
await pythonSettings.update('condaPath', undefined, vscode.ConfigurationTarget.Global);
116-
if (experiments.inExperimentSync(DeprecatePythonPath.experiment)) {
117-
await resetGlobalInterpreterPathSetting();
118-
} else {
119-
await restorePythonPathInWorkspaceRoot();
120-
}
110+
await resetGlobalInterpreterPathSetting();
121111
}
122112

123113
/**
@@ -158,11 +148,7 @@ suite('Activation of Environments in Terminal', () => {
158148
vscode.workspace.workspaceFolders![0].uri,
159149
vscode.ConfigurationTarget.WorkspaceFolder,
160150
);
161-
if (experiments.inExperimentSync(DeprecatePythonPath.experiment)) {
162-
await setGlobalInterpreterPath(envPath);
163-
} else {
164-
await setPythonPathInWorkspaceRoot(envPath);
165-
}
151+
await setGlobalInterpreterPath(envPath);
166152
const content = await openTerminalAndAwaitCommandContent(waitTimeForActivation, file, outputFile, 5_000);
167153
expect(fileSystem.arePathsSame(content, envPath)).to.equal(true, 'Environment not activated');
168154
}

src/test/startupTelemetry.unit.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { expect } from 'chai';
77
import * as TypeMoq from 'typemoq';
88
import { Uri } from 'vscode';
99
import { IWorkspaceService } from '../client/common/application/types';
10-
import { DeprecatePythonPath } from '../client/common/experiments/groups';
1110
import { IExperimentService, IInterpreterPathService } from '../client/common/types';
1211
import { IServiceContainer } from '../client/ioc/types';
1312
import { hasUserDefinedPythonPath } from '../client/startupTelemetry';

0 commit comments

Comments
 (0)