Clean up sleeps and unit test settings

Author: andyleejordan

.vscode-test.mjs

@@ -1,20 +1,20 @@
 import { defineConfig } from "@vscode/test-cli";
-import os from "os";
-import path from "path";
 
 export default defineConfig({
     files: "test/**/*.test.ts",
-    // The default user data directory had too many characters for the IPC connection on macOS in CI.
+    // It may break CI but we'll know sooner rather than later
+    version: "insiders",
     launchArgs: [
+        // Other extensions are unnecessary while testing
+        "--disable-extensions",
+        // Undocumented but valid option to use a temporary profile for testing
         "--profile-temp",
-        "--user-data-dir",
-        path.join(os.tmpdir(), "vscode-user-data"),
     ],
     workspaceFolder: "test/TestEnvironment.code-workspace",
     mocha: {
         ui: "bdd", // describe, it, etc.
         require: ["esbuild-register"], // transpile TypeScript on-the-fly
-        slow: 2000, // 2 seconds for slow test
-        timeout: 60 * 1000, // 10 minutes to allow for debugging
+        slow: 2 * 1000, // 2 seconds for slow test
+        timeout: 2 * 60 * 1000, // 2 minutes to allow for debugging
     },
 });

src/extension.ts

@@ -29,7 +29,7 @@ import { LanguageClientConsumer } from "./languageClientConsumer";
 import { Logger } from "./logging";
 import { SessionManager } from "./session";
 import { getSettings } from "./settings";
-import { PowerShellLanguageId } from "./utils";
+import { PowerShellLanguageId, sleep } from "./utils";
 // The 1DS telemetry key, which is just shared among all Microsoft extensions
 // (and isn't sensitive).
 const TELEMETRY_KEY =
@@ -257,7 +257,7 @@ function registerWaitForPsesActivationCommand(
                     return pidContent.toString();
                 } catch {
                     // File doesn't exist yet, wait and try again
-                    await new Promise((resolve) => setTimeout(resolve, 1000));
+                    await sleep(200);
                 }
             }
         },

src/process.ts

@@ -315,7 +315,7 @@ export class PowerShellProcess {
             }
 
             // Wait a bit and try again.
-            await utils.sleep(1000);
+            await utils.sleep(200);
         }
 
         this.logger.writeError("Timed out waiting for session file!");

src/session.ts

@@ -319,7 +319,7 @@ export class SessionManager implements Middleware {
         try {
             // If the stop fails, so will the dispose, I think this is a bug in
             // the client library.
-            await this.languageClient?.stop(3000);
+            await this.languageClient?.stop(2000);
             await this.languageClient?.dispose();
         } catch (err) {
             this.logger.writeError(
@@ -491,7 +491,7 @@ export class SessionManager implements Middleware {
 
     public async waitUntilStarted(): Promise<void> {
         while (this.sessionStatus !== SessionStatus.Running) {
-            await utils.sleep(300);
+            await utils.sleep(200);
         }
     }
 
@@ -1180,13 +1180,13 @@ Type 'help' to get help.
             ) {
                 return;
             }
-            await utils.sleep(300);
+            await utils.sleep(200);
         }
     }
 
     private async waitWhileStopping(): Promise<void> {
         while (this.sessionStatus === SessionStatus.Stopping) {
-            await utils.sleep(300);
+            await utils.sleep(200);
         }
     }
 

test/features/DebugSession.test.ts

@@ -656,8 +656,6 @@ describe("DebugSessionFeature", () => {
 });
 
 describe("DebugSessionFeature E2E", function () {
-    // E2E tests can take a while to run since the debugger has to start up and attach
-    this.slow(20000);
     before(async () => {
         // Registers and warms up the debug adapter and the PowerShell Extension Terminal
         await ensureEditorServicesIsConnected();

test/features/ISECompatibility.test.ts

@@ -94,8 +94,6 @@ describe("ISE compatibility feature", function () {
     });
 
     describe("Color theme interactions", function () {
-        // These tests are slow because they change the user's theme.
-        this.slow(3000);
         beforeEach(enableISEMode);
 
         function assertISESettings(): void {

test/utils.ts

@@ -6,6 +6,7 @@ import * as path from "path";
 import * as vscode from "vscode";
 import type { IPowerShellExtensionClient } from "../src/features/ExternalApi";
 import type { ILogger } from "../src/logging";
+import { sleep } from "../src/utils";
 
 // This lets us test the rest of our path assumptions against the baseline of
 // this test file existing at `<root>/test/utils.js`.
@@ -64,11 +65,19 @@ export class TestLogger implements ILogger {
 export const testLogger = new TestLogger();
 
 export async function ensureExtensionIsActivated(): Promise<IPowerShellExtensionClient> {
-    const extension = vscode.extensions.getExtension(extensionId);
-    if (!extension!.isActive) {
-        await extension!.activate();
+    let extension = vscode.extensions.getExtension(extensionId);
+    while (!extension) {
+        // Wait for VS Code to be ready
+        testLogger.writeDebug(`Extension ${extensionId} not yet found...`);
+        await sleep(200);
+        extension = vscode.extensions.getExtension(extensionId);
+        // Wait for VS Code to be ready
+        await sleep(200);
     }
-    return extension!.exports as IPowerShellExtensionClient;
+    if (!extension.isActive) {
+        await extension.activate();
+    }
+    return extension.exports as IPowerShellExtensionClient;
 }
 
 export async function ensureEditorServicesIsConnected(): Promise<IPowerShellExtensionClient> {