revert VSC_PYTHON_CI_TEST_VSC_CHANNEL changes

microsoft · Sep 25, 2020 · 6ed8f61 · 6ed8f61
1 parent 66a4cb1
commit 6ed8f61
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/build/ci/templates/globals.yml b/build/ci/templates/globals.yml
@@ -11,4 +11,3 @@ variables:
   npm_config_cache: $(Pipeline.Workspace)/.npm
   vmImageMacOS: 'macOS-10.15'
   TS_NODE_FILES: true # Temporarily enabled to allow using types from vscode.proposed.d.ts from ts-node (for tests).
-  VSC_PYTHON_CI_TEST_VSC_CHANNEL: '1.48.0' # Enforce this until https://github.com/microsoft/vscode-test/issues/73 is fixed
diff --git a/src/test/debuggerTest.ts b/src/test/debuggerTest.ts
@@ -10,7 +10,6 @@ import { EXTENSION_ROOT_DIR_FOR_TESTS } from './constants';
 const workspacePath = path.join(__dirname, '..', '..', 'src', 'testMultiRootWkspc', 'multi.code-workspace');
 process.env.IS_CI_SERVER_TEST_DEBUGGER = '1';
 process.env.VSC_PYTHON_CI_TEST = '1';
-const channel = process.env.VSC_PYTHON_CI_TEST_VSC_CHANNEL || 'stable';
 
 function start() {
     console.log('*'.repeat(100));
@@ -19,7 +18,7 @@ function start() {
         extensionDevelopmentPath: EXTENSION_ROOT_DIR_FOR_TESTS,
         extensionTestsPath: path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'out', 'test', 'index'),
         launchArgs: [workspacePath],
-        version: channel,
+        version: 'stable',
         extensionTestsEnv: { ...process.env, UITEST_DISABLE_INSIDERS: '1' }
     }).catch((ex) => {
         console.error('End Debugger tests (with errors)', ex);

diff --git a/src/test/multiRootTest.ts b/src/test/multiRootTest.ts
@@ -11,16 +11,14 @@ process.env.VSC_PYTHON_CI_TEST = '1';
 
 initializeLogger();
 
-const channel = process.env.VSC_PYTHON_CI_TEST_VSC_CHANNEL || 'stable';
-
 function start() {
     console.log('*'.repeat(100));
     console.log('Start Multiroot tests');
     runTests({
         extensionDevelopmentPath: EXTENSION_ROOT_DIR_FOR_TESTS,
         extensionTestsPath: path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'out', 'test', 'index'),
         launchArgs: [workspacePath],
-        version: channel,
+        version: 'stable',
         extensionTestsEnv: { ...process.env, UITEST_DISABLE_INSIDERS: '1' }
     }).catch((ex) => {
         console.error('End Multiroot tests (with errors)', ex);

diff --git a/src/test/standardTest.ts b/src/test/standardTest.ts
@@ -16,7 +16,9 @@ const extensionDevelopmentPath = process.env.CODE_EXTENSIONS_PATH
     ? process.env.CODE_EXTENSIONS_PATH
     : EXTENSION_ROOT_DIR_FOR_TESTS;
 
-const channel = process.env.VSC_PYTHON_CI_TEST_VSC_CHANNEL || 'stable';
+const channel = (process.env.VSC_PYTHON_CI_TEST_VSC_CHANNEL || '').toLowerCase().includes('insiders')
+    ? 'insiders'
+    : 'stable';
 
 function start() {
     console.log('*'.repeat(100));