fix flaky test

Author: eleanorjboyd

src/client/terminals/codeExecution/codeExecutionManager.ts

@@ -45,6 +45,7 @@ export class CodeExecutionManager implements ICodeExecutionManager {
                         const newTerminalPerFile = cmd === Commands.Exec_In_Separate_Terminal;
 
                         if (useEnvExtension()) {
+                            traceVerbose('Using Environment Extension to execute file in terminal');
                             try {
                                 await this.executeUsingExtension(file, cmd === Commands.Exec_In_Separate_Terminal);
                             } catch (ex) {
@@ -124,36 +125,54 @@ export class CodeExecutionManager implements ICodeExecutionManager {
     }
 
     private async executeUsingExtension(file: Resource, dedicated: boolean): Promise<void> {
+        traceVerbose(`executeUsingExtension called with file: ${file?.fsPath}, dedicated: ${dedicated}`);
         const codeExecutionHelper = this.serviceContainer.get<ICodeExecutionHelper>(ICodeExecutionHelper);
         file = file instanceof Uri ? file : undefined;
         let fileToExecute = file ? file : await codeExecutionHelper.getFileToExecute();
         if (!fileToExecute) {
+            traceVerbose('executeUsingExtension: No file to execute, returning early');
             return;
         }
+        traceVerbose(`executeUsingExtension: File to execute: ${fileToExecute.fsPath}`);
 
         const fileAfterSave = await codeExecutionHelper.saveFileIfDirty(fileToExecute);
         if (fileAfterSave) {
+            traceVerbose(`executeUsingExtension: File saved, updated path: ${fileAfterSave.fsPath}`);
             fileToExecute = fileAfterSave;
         }
 
         // Check on setting terminal.executeInFileDir
         const pythonSettings = this.configSettings.getSettings(file);
         let cwd = pythonSettings.terminal.executeInFileDir ? path.dirname(fileToExecute.fsPath) : undefined;
+        traceVerbose(
+            `executeUsingExtension: CWD: ${cwd}, executeInFileDir: ${pythonSettings.terminal.executeInFileDir}`,
+        );
 
         // Check on setting terminal.launchArgs
         const launchArgs = pythonSettings.terminal.launchArgs;
         const totalArgs = [...launchArgs, fileToExecute.fsPath.fileToCommandArgumentForPythonExt()];
+        traceVerbose(
+            `executeUsingExtension: Launch args: ${JSON.stringify(launchArgs)}, Total args: ${JSON.stringify(
+                totalArgs,
+            )}`,
+        );
 
         const show = this.shouldTerminalFocusOnStart(fileToExecute);
+        traceVerbose(`executeUsingExtension: Terminal focus on start: ${show}, Using dedicated terminal: ${dedicated}`);
         let terminal: Terminal | undefined;
         if (dedicated) {
+            traceVerbose('executeUsingExtension: Calling runInDedicatedTerminal');
             terminal = await runInDedicatedTerminal(fileToExecute, totalArgs, cwd, show);
         } else {
+            traceVerbose('executeUsingExtension: Calling runInTerminal');
             terminal = await runInTerminal(fileToExecute, totalArgs, cwd, show);
         }
 
         if (terminal) {
+            traceVerbose(`executeUsingExtension: Terminal created successfully, showing terminal`);
             terminal.show();
+        } else {
+            traceVerbose('executeUsingExtension: No terminal returned from run function');
         }
     }
 

src/testMultiRootWkspc/smokeTests/testExecInTerminal.py

@@ -10,7 +10,9 @@
 
 # If the output file is given, use that instead.
 if len(args) == 2:
+    print("Using log file from argument:", args[1])
     log_file = args[1]
 
 with open(log_file, "a") as f:
+    print("Writing to log file:", log_file)
     f.write(sys.executable)