Remove hack to check the vscode version (#21180)

Closed: #20769

Author: paulacamargo25

package-lock.json

@@ -45,7 +45,7 @@
         "theme": "dark"
     },
     "engines": {
-        "vscode": "^1.78.0-20230421"
+        "vscode": "^1.78.0"
     },
     "keywords": [
         "python",

package.json

@@ -4,7 +4,7 @@
 import * as path from 'path';
 import { runTests } from '@vscode/test-electron';
 import { EXTENSION_ROOT_DIR_FOR_TESTS } from './constants';
-import { getChannel } from './utils/vscode';
+import { getVersion } from './utils/vscode';
 
 const workspacePath = path.join(__dirname, '..', '..', 'src', 'testMultiRootWkspc', 'multi.code-workspace');
 process.env.IS_CI_SERVER_TEST_DEBUGGER = '1';
@@ -17,7 +17,7 @@ function start() {
         extensionDevelopmentPath: EXTENSION_ROOT_DIR_FOR_TESTS,
         extensionTestsPath: path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'out', 'test', 'index'),
         launchArgs: [workspacePath],
-        version: getChannel(),
+        version: getVersion(),
         extensionTestsEnv: { ...process.env, UITEST_DISABLE_INSIDERS: '1' },
     }).catch((ex) => {
         console.error('End Debugger tests (with errors)', ex);

src/test/debuggerTest.ts

@@ -2,7 +2,7 @@ import * as path from 'path';
 import { runTests } from '@vscode/test-electron';
 import { EXTENSION_ROOT_DIR_FOR_TESTS } from './constants';
 import { initializeLogger } from './testLogger';
-import { getChannel } from './utils/vscode';
+import { getVersion } from './utils/vscode';
 
 const workspacePath = path.join(__dirname, '..', '..', 'src', 'testMultiRootWkspc', 'multi.code-workspace');
 process.env.IS_CI_SERVER_TEST_DEBUGGER = '';
@@ -17,7 +17,7 @@ function start() {
         extensionDevelopmentPath: EXTENSION_ROOT_DIR_FOR_TESTS,
         extensionTestsPath: path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'out', 'test', 'index'),
         launchArgs: [workspacePath],
-        version: getChannel(),
+        version: getVersion(),
         extensionTestsEnv: { ...process.env, UITEST_DISABLE_INSIDERS: '1' },
     }).catch((ex) => {
         console.error('End Multiroot tests (with errors)', ex);

src/test/multiRootTest.ts

@@ -5,7 +5,7 @@ import * as path from 'path';
 import { downloadAndUnzipVSCode, resolveCliPathFromVSCodeExecutablePath, runTests } from '@vscode/test-electron';
 import { JUPYTER_EXTENSION_ID, PYLANCE_EXTENSION_ID } from '../client/common/constants';
 import { EXTENSION_ROOT_DIR_FOR_TESTS } from './constants';
-import { getChannel } from './utils/vscode';
+import { getVersion } from './utils/vscode';
 
 // If running smoke tests, we don't have access to this.
 if (process.env.TEST_FILES_SUFFIX !== 'smoke.test') {
@@ -76,7 +76,7 @@ async function installPylanceExtension(vscodeExecutablePath: string) {
 async function start() {
     console.log('*'.repeat(100));
     console.log('Start Standard tests');
-    const channel = getChannel();
+    const channel = getVersion();
     console.log(`Using ${channel} build of VS Code.`);
     const vscodeExecutablePath = await downloadAndUnzipVSCode(channel);
     const baseLaunchArgs =

src/test/standardTest.ts

@@ -2,22 +2,14 @@ import * as path from 'path';
 import * as fs from 'fs-extra';
 import { EXTENSION_ROOT_DIR } from '../../client/common/constants';
 
-const insidersVersion = /^\^(\d+\.\d+\.\d+)-(insider|\d{8})$/;
-
-export function getChannel(): string {
+export function getVersion(): string {
     if (process.env.VSC_PYTHON_CI_TEST_VSC_CHANNEL) {
         return process.env.VSC_PYTHON_CI_TEST_VSC_CHANNEL;
     }
     const packageJsonPath = path.join(EXTENSION_ROOT_DIR, 'package.json');
     if (fs.pathExistsSync(packageJsonPath)) {
         const packageJson = fs.readJSONSync(packageJsonPath);
-        const engineVersion = packageJson.engines.vscode;
-        if (insidersVersion.test(engineVersion)) {
-            // Can't pass in the version number for an insiders build;
-            // https://github.com/microsoft/vscode-test/issues/176
-            return 'insiders';
-        }
-        return engineVersion.replace('^', '');
+        return packageJson.engines.vscode.replace('^', '');
     }
     return 'stable';
 }