Incorporated the extract method command #18518

news/2 Fixes/18514.md

@@ -0,0 +1 @@
+Not use --live-stream with conda run (Thanks [Harry-Hopkinson](https://github.com/Harry-Hopkinson))

src/client/debugger/extension/adapter/factory.ts

@@ -161,7 +161,6 @@ export class DebugAdapterDescriptorFactory implements IDebugAdapterDescriptorFac
                             '-n',
                             interpreter.envName,
                             '--no-capture-output',
-                            '--live-stream',
                             'python',
                         ];
                     } else if (interpreter.envPath) {
@@ -171,7 +170,6 @@ export class DebugAdapterDescriptorFactory implements IDebugAdapterDescriptorFac
                             '-p',
                             interpreter.envPath,
                             '--no-capture-output',
-                            '--live-stream',
                             'python',
                         ];
                     }

src/client/pythonEnvironments/common/environmentManagers/conda.ts

@@ -416,7 +416,7 @@ export class Conda {
         } else {
             args.push('-p', env.prefix);
         }
-        return [this.command, 'run', ...args, '--no-capture-output', '--live-stream', 'python', OUTPUT_MARKER_SCRIPT];
+        return [this.command, 'run', ...args, '--no-capture-output', 'python', OUTPUT_MARKER_SCRIPT];
     }
 
     /**

src/test/common/process/pythonEnvironment.unit.test.ts

@@ -291,26 +291,8 @@ suite('CondaEnvironment', () => {
 
         expect(result).to.deep.equal({
             command: condaFile,
-            args: [
-                'run',
-                '-n',
-                condaInfo.name,
-                '--no-capture-output',
-                '--live-stream',
-                'python',
-                OUTPUT_MARKER_SCRIPT,
-                ...args,
-            ],
-            python: [
-                condaFile,
-                'run',
-                '-n',
-                condaInfo.name,
-                '--no-capture-output',
-                '--live-stream',
-                'python',
-                OUTPUT_MARKER_SCRIPT,
-            ],
+            args: ['run', '-n', condaInfo.name, '--no-capture-output', 'python', OUTPUT_MARKER_SCRIPT, ...args],
+            python: [condaFile, 'run', '-n', condaInfo.name, '--no-capture-output', 'python', OUTPUT_MARKER_SCRIPT],
             pythonExecutable: pythonPath,
         });
     });
@@ -323,26 +305,8 @@ suite('CondaEnvironment', () => {
 
         expect(result).to.deep.equal({
             command: condaFile,
-            args: [
-                'run',
-                '-p',
-                condaInfo.path,
-                '--no-capture-output',
-                '--live-stream',
-                'python',
-                OUTPUT_MARKER_SCRIPT,
-                ...args,
-            ],
-            python: [
-                condaFile,
-                'run',
-                '-p',
-                condaInfo.path,
-                '--no-capture-output',
-                '--live-stream',
-                'python',
-                OUTPUT_MARKER_SCRIPT,
-            ],
+            args: ['run', '-p', condaInfo.path, '--no-capture-output', 'python', OUTPUT_MARKER_SCRIPT, ...args],
+            python: [condaFile, 'run', '-p', condaInfo.path, '--no-capture-output', 'python', OUTPUT_MARKER_SCRIPT],
             pythonExecutable: pythonPath,
         });
     });
@@ -351,26 +315,8 @@ suite('CondaEnvironment', () => {
         const condaInfo = { name: 'foo', path: 'bar' };
         const expected = {
             command: condaFile,
-            args: [
-                'run',
-                '-n',
-                condaInfo.name,
-                '--no-capture-output',
-                '--live-stream',
-                'python',
-                OUTPUT_MARKER_SCRIPT,
-                ...args,
-            ],
-            python: [
-                condaFile,
-                'run',
-                '-n',
-                condaInfo.name,
-                '--no-capture-output',
-                '--live-stream',
-                'python',
-                OUTPUT_MARKER_SCRIPT,
-            ],
+            args: ['run', '-n', condaInfo.name, '--no-capture-output', 'python', OUTPUT_MARKER_SCRIPT, ...args],
+            python: [condaFile, 'run', '-n', condaInfo.name, '--no-capture-output', 'python', OUTPUT_MARKER_SCRIPT],
             pythonExecutable: pythonPath,
         };
         const env = await createCondaEnv(condaInfo, pythonPath, processService.object, fileSystem.object);
@@ -384,26 +330,8 @@ suite('CondaEnvironment', () => {
         const condaInfo = { name: '', path: 'bar' };
         const expected = {
             command: condaFile,
-            args: [
-                'run',
-                '-p',
-                condaInfo.path,
-                '--no-capture-output',
-                '--live-stream',
-                'python',
-                OUTPUT_MARKER_SCRIPT,
-                ...args,
-            ],
-            python: [
-                condaFile,
-                'run',
-                '-p',
-                condaInfo.path,
-                '--no-capture-output',
-                '--live-stream',
-                'python',
-                OUTPUT_MARKER_SCRIPT,
-            ],
+            args: ['run', '-p', condaInfo.path, '--no-capture-output', 'python', OUTPUT_MARKER_SCRIPT, ...args],
+            python: [condaFile, 'run', '-p', condaInfo.path, '--no-capture-output', 'python', OUTPUT_MARKER_SCRIPT],
             pythonExecutable: pythonPath,
         };
         const env = await createCondaEnv(condaInfo, pythonPath, processService.object, fileSystem.object);

src/test/pythonEnvironments/common/environmentManagers/conda.unit.test.ts

@@ -481,14 +481,14 @@ suite('Conda and its environments are located correctly', () => {
         expect(args).to.not.equal(undefined);
         assert.deepStrictEqual(
             args,
-            ['conda', 'run', '-n', 'envName', '--no-capture-output', '--live-stream', 'python', OUTPUT_MARKER_SCRIPT],
+            ['conda', 'run', '-n', 'envName', '--no-capture-output', 'python', OUTPUT_MARKER_SCRIPT],
             'Incorrect args for case 1',
         );
 
         args = await conda?.getRunPythonArgs({ name: '', prefix: 'envPrefix' });
         assert.deepStrictEqual(
             args,
-            ['conda', 'run', '-p', 'envPrefix', '--no-capture-output', '--live-stream', 'python', OUTPUT_MARKER_SCRIPT],
+            ['conda', 'run', '-p', 'envPrefix', '--no-capture-output', 'python', OUTPUT_MARKER_SCRIPT],
             'Incorrect args for case 2',
         );
     });