Skip to content

Commit 6ed8f61

Browse files
committed
revert VSC_PYTHON_CI_TEST_VSC_CHANNEL changes
1 parent 66a4cb1 commit 6ed8f61

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

build/ci/templates/globals.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@ variables:
1111
npm_config_cache: $(Pipeline.Workspace)/.npm
1212
vmImageMacOS: 'macOS-10.15'
1313
TS_NODE_FILES: true # Temporarily enabled to allow using types from vscode.proposed.d.ts from ts-node (for tests).
14-
VSC_PYTHON_CI_TEST_VSC_CHANNEL: '1.48.0' # Enforce this until https://github.com/microsoft/vscode-test/issues/73 is fixed

src/test/debuggerTest.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { EXTENSION_ROOT_DIR_FOR_TESTS } from './constants';
1010
const workspacePath = path.join(__dirname, '..', '..', 'src', 'testMultiRootWkspc', 'multi.code-workspace');
1111
process.env.IS_CI_SERVER_TEST_DEBUGGER = '1';
1212
process.env.VSC_PYTHON_CI_TEST = '1';
13-
const channel = process.env.VSC_PYTHON_CI_TEST_VSC_CHANNEL || 'stable';
1413

1514
function start() {
1615
console.log('*'.repeat(100));
@@ -19,7 +18,7 @@ function start() {
1918
extensionDevelopmentPath: EXTENSION_ROOT_DIR_FOR_TESTS,
2019
extensionTestsPath: path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'out', 'test', 'index'),
2120
launchArgs: [workspacePath],
22-
version: channel,
21+
version: 'stable',
2322
extensionTestsEnv: { ...process.env, UITEST_DISABLE_INSIDERS: '1' }
2423
}).catch((ex) => {
2524
console.error('End Debugger tests (with errors)', ex);

src/test/multiRootTest.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,14 @@ process.env.VSC_PYTHON_CI_TEST = '1';
1111

1212
initializeLogger();
1313

14-
const channel = process.env.VSC_PYTHON_CI_TEST_VSC_CHANNEL || 'stable';
15-
1614
function start() {
1715
console.log('*'.repeat(100));
1816
console.log('Start Multiroot tests');
1917
runTests({
2018
extensionDevelopmentPath: EXTENSION_ROOT_DIR_FOR_TESTS,
2119
extensionTestsPath: path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'out', 'test', 'index'),
2220
launchArgs: [workspacePath],
23-
version: channel,
21+
version: 'stable',
2422
extensionTestsEnv: { ...process.env, UITEST_DISABLE_INSIDERS: '1' }
2523
}).catch((ex) => {
2624
console.error('End Multiroot tests (with errors)', ex);

src/test/standardTest.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ const extensionDevelopmentPath = process.env.CODE_EXTENSIONS_PATH
1616
? process.env.CODE_EXTENSIONS_PATH
1717
: EXTENSION_ROOT_DIR_FOR_TESTS;
1818

19-
const channel = process.env.VSC_PYTHON_CI_TEST_VSC_CHANNEL || 'stable';
19+
const channel = (process.env.VSC_PYTHON_CI_TEST_VSC_CHANNEL || '').toLowerCase().includes('insiders')
20+
? 'insiders'
21+
: 'stable';
2022

2123
function start() {
2224
console.log('*'.repeat(100));

0 commit comments

Comments
 (0)