Fixing python path

microsoft · May 12, 2023 · 75ee993 · 75ee993
1 parent 2fb18e9
commit 75ee993
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -23,7 +23,7 @@
                 "XVSC_PYTHON_LOG_TELEMETRY": "1",
                 // Enable this to log debugger output. Directory must exist ahead of time
                 "XDEBUGPY_LOG_DIR": "${workspaceRoot}/tmp/Debug_Output_Ex",
-                // "ENABLE_PYTHON_TESTING_REWRITE": "1"
+                "ENABLE_PYTHON_TESTING_REWRITE": "1"
             }
         },
         {

diff --git a/src/client/common/process/internal/scripts/index.ts b/src/client/common/process/internal/scripts/index.ts
@@ -126,12 +126,6 @@ export function execution_py_testlauncher(testArgs: string[]): string[] {
     return [script, ...testArgs];
 }
 
-// eslint-disable-next-line camelcase
-export function execution_pytest_testlauncher(testArgs: string[]): string[] {
-    //  const script = path.join(SCRIPTS_DIR, 'unittestadapter', 'execution.py');
-    return ['/opt/homebrew/bin/python3', ...testArgs];
-}
-
 // tensorboard_launcher.py
 
 export function tensorboardLauncher(args: string[]): string[] {

diff --git a/src/client/testing/common/debugLauncher.ts b/src/client/testing/common/debugLauncher.ts
@@ -238,7 +238,7 @@ export class DebugLauncher implements ITestDebugLauncher {
             }
             case 'pytest': {
                 if (rewriteTestingEnabled) {
-                    return internalScripts.execution_pytest_testlauncher; // this is the new way to run pytest execution, debugger
+                    return (testArgs: string[]) => testArgs;
                 }
                 return internalScripts.testlauncher; // old way pytest execution, debugger
             }

diff --git a/src/client/testing/testController/pytest/pytestExecutionAdapter.ts b/src/client/testing/testController/pytest/pytestExecutionAdapter.ts
@@ -12,13 +12,13 @@ import {
     IPythonExecutionFactory,
     SpawnOptions,
 } from '../../../common/process/types';
-import { EXTENSION_ROOT_DIR } from '../../../constants';
 import { removePositionalFoldersAndFiles } from './arguments';
 import { ITestDebugLauncher, LaunchOptions } from '../../common/types';
 import { PYTEST_PROVIDER } from '../../common/constants';
+import { EXTENSION_ROOT_DIR } from '../../../common/constants';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-(global as any).EXTENSION_ROOT_DIR = EXTENSION_ROOT_DIR;
+// (global as any).EXTENSION_ROOT_DIR = EXTENSION_ROOT_DIR;
 /**
  * Wrapper Class for pytest test execution. This is where we call `runTestCommand`?
  */