Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,10 @@ suite('Insiders Extension Service - Activation', () => {
let handleEdgeCases: sinon.SinonStub<any>;
let insidersInstaller: IExtensionBuildInstaller;
let insidersExtensionService: InsidersExtensionService;
let envUITEST_DISABLE_INSIDERSExists = false;
setup(() => {
envUITEST_DISABLE_INSIDERSExists = process.env.UITEST_DISABLE_INSIDERS !== undefined;
delete process.env.UITEST_DISABLE_INSIDERS;
extensionChannelService = mock(ExtensionChannelService);
insidersInstaller = mock(InsidersBuildInstaller);
appEnvironment = mock(ApplicationEnvironment);
Expand All @@ -112,6 +115,9 @@ suite('Insiders Extension Service - Activation', () => {
});

teardown(() => {
if (envUITEST_DISABLE_INSIDERSExists) {
process.env.UITEST_DISABLE_INSIDERS = '1';
}
sinon.restore();
});

Expand Down
3 changes: 2 additions & 1 deletion src/test/debuggerTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ function start() {
extensionDevelopmentPath: EXTENSION_ROOT_DIR_FOR_TESTS,
extensionTestsPath: path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'out', 'test', 'index'),
launchArgs: [workspacePath],
version: 'stable'
version: 'insiders',
extensionTestsEnv: { ...process.env, UITEST_DISABLE_INSIDERS: '1' }
}).catch(ex => {
console.error('End Debugger tests (with errors)', ex);
process.exit(1);
Expand Down
3 changes: 2 additions & 1 deletion src/test/multiRootTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ function start() {
extensionDevelopmentPath: EXTENSION_ROOT_DIR_FOR_TESTS,
extensionTestsPath: path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'out', 'test', 'index'),
launchArgs: [workspacePath, '--enable-proposed-api', 'ms-python.python'],
version: 'insiders'
version: 'insiders',
extensionTestsEnv: { ...process.env, UITEST_DISABLE_INSIDERS: '1' }
}).catch(ex => {
console.error('End Multiroot tests (with errors)', ex);
process.exit(1);
Expand Down
3 changes: 2 additions & 1 deletion src/test/standardTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ function start() {
extensionDevelopmentPath: extensionDevelopmentPath,
extensionTestsPath: path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'out', 'test', 'index'),
launchArgs: [workspacePath, '--enable-proposed-api', 'ms-python.python'],
version: 'insiders'
version: 'insiders',
extensionTestsEnv: { ...process.env, UITEST_DISABLE_INSIDERS: '1' }
}).catch(ex => {
console.error('End Standard tests (with errors)', ex);
process.exit(1);
Expand Down