Fix race condition in RunPesterTestsFromFile test

Author: andyleejordan

src/features/PesterTests.ts

@@ -132,18 +132,17 @@ export class PesterTestsFeature implements vscode.Disposable {
     private async launch(launchConfig): Promise<boolean> {
         // Create or show the interactive console
         // TODO: #367 Check if "newSession" mode is configured
-        vscode.commands.executeCommand("PowerShell.ShowSessionConsole", true);
+        await vscode.commands.executeCommand("PowerShell.ShowSessionConsole", true);
 
         // Write out temporary debug session file
         utils.writeSessionFile(
             utils.getDebugSessionFilePath(),
             this.sessionManager.getSessionDetails());
 
         // TODO: Update to handle multiple root workspaces.
-        //
-        // Ensure the necessary script exists (for testing). The debugger will
-        // start regardless, but we also pass its success along.
-        return utils.fileExists(this.invokePesterStubScriptPath)
-            && vscode.debug.startDebugging(vscode.workspace.workspaceFolders[0], launchConfig);
+        await vscode.debug.startDebugging(vscode.workspace.workspaceFolders[0], launchConfig);
+
+        // Ensure the necessary script exists (for testing).
+        return utils.fileExists(this.invokePesterStubScriptPath);
     }
 }

test/features/RunCode.test.ts

@@ -4,10 +4,11 @@
 import * as assert from "assert";
 import * as fs from "fs";
 import * as path from "path";
-import { suiteSetup } from "mocha";
 import rewire = require("rewire");
 import vscode = require("vscode");
 import utils = require("../utils");
+import { sleep } from "../../src/utils";
+import { IPowerShellExtensionClient } from "../../src/features/ExternalApi";
 
 // Setup function that is not exported.
 const customViews = rewire("../../src/features/RunCode");
@@ -19,8 +20,6 @@ enum LaunchType {
 }
 
 suite("RunCode tests", () => {
-    suiteSetup(utils.ensureExtensionIsActivated);
-
     test("Can create the launch config", () => {
         const commandToRun: string = "Invoke-Build";
         const args: string[] = ["Clean"];
@@ -45,8 +44,24 @@ suite("RunCode tests", () => {
     test("Can run Pester tests from file", async () => {
         const pesterTests = path.resolve(__dirname, "../../../examples/Tests/SampleModule.Tests.ps1");
         assert(fs.existsSync(pesterTests));
+
+        // Get interface to extension.
+        const extension = await utils.ensureExtensionIsActivated();
+        const client = extension!.exports as IPowerShellExtensionClient;
+        const sessionId = client.registerExternalExtension(utils.extensionId);
+
+        // Force PowerShell extension to finish connecting. This is necessary
+        // because we can't start the PowerShell debugger until the session is
+        // connected, which is different from the extension being activated. We
+        // also need to open the file so the command has it as its argument.
         await vscode.commands.executeCommand("vscode.open", vscode.Uri.file(pesterTests));
+        await client.getPowerShellVersionDetails(sessionId);
+
+        // Now run the Pester tests.
         assert(await vscode.commands.executeCommand("PowerShell.RunPesterTestsFromFile"));
-        // Start up can take some time...so set the timeout to 30 seconds.
-    }).timeout(30000);
+        assert(vscode.debug.activeDebugSession !== undefined);
+        await sleep(5000);
+        await vscode.debug.stopDebugging(vscode.debug.activeDebugSession);
+        // PowerShell can take a while, so set the timeout to a full minute.
+    }).timeout(60000);
 });