add rewrite env var

microsoft · May 12, 2023 · b42cc1c · b42cc1c
1 parent c99e434
commit b42cc1c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 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/pythonFiles/vscode_pytest/__init__.py b/pythonFiles/vscode_pytest/__init__.py
@@ -497,4 +497,3 @@ def post_response(cwd: str, session_node: TestNode) -> None:
                 f"Plugin!! error connection error[vscode-pytest]: {e}, port: {testPort}"
             )
             print(f"[vscode-pytest] data: {request}")
-            print(f"attempted port: {testPort}")
diff --git a/src/client/common/process/internal/scripts/index.ts b/src/client/common/process/internal/scripts/index.ts
@@ -126,7 +126,6 @@ export function execution_py_testlauncher(testArgs: string[]): string[] {
     return [script, ...testArgs];
 }
 
-// execution.py
 // eslint-disable-next-line camelcase
 export function execution_pytest_testlauncher(testArgs: string[]): string[] {
     //  const script = path.join(SCRIPTS_DIR, 'unittestadapter', 'execution.py');

diff --git a/src/client/testing/common/debugLauncher.ts b/src/client/testing/common/debugLauncher.ts
@@ -179,7 +179,8 @@ export class DebugLauncher implements ITestDebugLauncher {
         const [program] = args;
         configArgs.program = program;
         // if the test provider is pytest, then use the pytest module instead of using a program
-        if (options.testProvider === 'pytest') {
+        const rewriteTestingEnabled = process.env.ENABLE_PYTHON_TESTING_REWRITE;
+        if (options.testProvider === 'pytest' && rewriteTestingEnabled) {
             configArgs.module = 'pytest';
             configArgs.program = undefined;
         }
@@ -203,7 +204,7 @@ export class DebugLauncher implements ITestDebugLauncher {
             throw Error(`Invalid debug config "${debugConfig.name}"`);
         }
         launchArgs.request = 'launch';
-        if (options.testProvider === 'pytest') {
+        if (options.testProvider === 'pytest' && rewriteTestingEnabled) {
             if (options.pytestPort && options.pytestUUID) {
                 launchArgs.env = {
                     ...launchArgs.env,
@@ -227,14 +228,19 @@ export class DebugLauncher implements ITestDebugLauncher {
     }
 
     private static getTestLauncherScript(testProvider: TestProvider) {
+        const rewriteTestingEnabled = process.env.ENABLE_PYTHON_TESTING_REWRITE;
         switch (testProvider) {
             case 'unittest': {
-                // return internalScripts.visualstudio_py_testlauncher; // old way unittest execution, debugger
-                return internalScripts.execution_py_testlauncher; // this is the new way to run unittest execution, debugger
+                if (rewriteTestingEnabled) {
+                    return internalScripts.execution_py_testlauncher; // this is the new way to run unittest execution, debugger
+                }
+                return internalScripts.visualstudio_py_testlauncher; // old way unittest execution, debugger
             }
             case 'pytest': {
-                // return internalScripts.shell_exec;
-                return internalScripts.execution_pytest_testlauncher;
+                if (rewriteTestingEnabled) {
+                    return internalScripts.execution_pytest_testlauncher; // this is the new way to run pytest execution, debugger
+                }
+                return internalScripts.testlauncher; // old way pytest execution, debugger
             }
             default: {
                 throw new Error(`Unknown test provider '${testProvider}'`);