2 files changed, 5 insertions, 3 deletions
diff --git a/extension/src/test-runner/mochaRunner.ts b/extension/src/test-runner/mochaRunner.ts
index b964fe5f..95fcbc5e 100644
--- a/extension/src/test-runner/mochaRunner.ts
+++ b/extension/src/test-runner/mochaRunner.ts
@@ -3,10 +3,14 @@ import Mocha from "mocha";
 import * as glob from "glob";
 
 export function run() {
+  // Avoid timing out when stopping on breakpoints during debugging in VSCode
+  const timeoutOption = process.env.MOCHA_TIMEOUT ? parseInt(process.env.MOCHA_TIMEOUT) : undefined;
+
   // Create the mocha test
   const mocha = new Mocha({
     ui: "tdd",
     color: true,
+    timeout: timeoutOption,
   });
 
   // See esbuild.test.mjs for more details
diff --git a/extension/src/test-suite/environmentSetup.test.ts b/extension/src/test-suite/environmentSetup.test.ts
index 6523cb00..d9fcfb2c 100644
--- a/extension/src/test-suite/environmentSetup.test.ts
+++ b/extension/src/test-suite/environmentSetup.test.ts
@@ -10,9 +10,7 @@ describe("Can start python server", () => {
     await startContinuePythonServer();
 
     await new Promise((resolve) => setTimeout(resolve, 500));
-
-    // Currently is flaky, keeping because still feels useful and we can fix in a followup commit
-    //
+    
     // Check if server is running
     const serverUrl = getContinueServerUrl();
     const response = await fetch(`${serverUrl}/health`);