Skip to content

Commit 75ee993

Browse files
committed
Fixing python path
1 parent 2fb18e9 commit 75ee993

File tree

4 files changed

+4
-10
lines changed

4 files changed

+4
-10
lines changed

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"XVSC_PYTHON_LOG_TELEMETRY": "1",
2424
// Enable this to log debugger output. Directory must exist ahead of time
2525
"XDEBUGPY_LOG_DIR": "${workspaceRoot}/tmp/Debug_Output_Ex",
26-
// "ENABLE_PYTHON_TESTING_REWRITE": "1"
26+
"ENABLE_PYTHON_TESTING_REWRITE": "1"
2727
}
2828
},
2929
{

src/client/common/process/internal/scripts/index.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,6 @@ export function execution_py_testlauncher(testArgs: string[]): string[] {
126126
return [script, ...testArgs];
127127
}
128128

129-
// eslint-disable-next-line camelcase
130-
export function execution_pytest_testlauncher(testArgs: string[]): string[] {
131-
// const script = path.join(SCRIPTS_DIR, 'unittestadapter', 'execution.py');
132-
return ['/opt/homebrew/bin/python3', ...testArgs];
133-
}
134-
135129
// tensorboard_launcher.py
136130

137131
export function tensorboardLauncher(args: string[]): string[] {

src/client/testing/common/debugLauncher.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ export class DebugLauncher implements ITestDebugLauncher {
238238
}
239239
case 'pytest': {
240240
if (rewriteTestingEnabled) {
241-
return internalScripts.execution_pytest_testlauncher; // this is the new way to run pytest execution, debugger
241+
return (testArgs: string[]) => testArgs;
242242
}
243243
return internalScripts.testlauncher; // old way pytest execution, debugger
244244
}

src/client/testing/testController/pytest/pytestExecutionAdapter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import {
1212
IPythonExecutionFactory,
1313
SpawnOptions,
1414
} from '../../../common/process/types';
15-
import { EXTENSION_ROOT_DIR } from '../../../constants';
1615
import { removePositionalFoldersAndFiles } from './arguments';
1716
import { ITestDebugLauncher, LaunchOptions } from '../../common/types';
1817
import { PYTEST_PROVIDER } from '../../common/constants';
18+
import { EXTENSION_ROOT_DIR } from '../../../common/constants';
1919

2020
// eslint-disable-next-line @typescript-eslint/no-explicit-any
21-
(global as any).EXTENSION_ROOT_DIR = EXTENSION_ROOT_DIR;
21+
// (global as any).EXTENSION_ROOT_DIR = EXTENSION_ROOT_DIR;
2222
/**
2323
* Wrapper Class for pytest test execution. This is where we call `runTestCommand`?
2424
*/

0 commit comments

Comments
 (0)