Make test smaller

Author: andyleejordan

test/features/RunCode.test.ts

@@ -6,9 +6,9 @@ import * as fs from "fs";
 import * as path from "path";
 import rewire = require("rewire");
 import vscode = require("vscode");
+import { suiteSetup } from "mocha";
 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");
@@ -20,6 +20,8 @@ enum LaunchType {
 }
 
 suite("RunCode tests", () => {
+    suiteSetup(utils.ensureExtensionIsActivated);
+
     test("Can create the launch config", () => {
         const commandToRun: string = "Invoke-Build";
         const args: string[] = ["Clean"];
@@ -41,33 +43,20 @@ suite("RunCode tests", () => {
         assert.deepStrictEqual(actual, expected);
     });
 
-    test("Can run Pester tests from file", async function() {
-        // PowerShell can take a while and is flaky, so try three times and set
-        // the timeout to thirty seconds each.
-        this.retries(3);
-        this.timeout(30000);
-
+    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.
+        // Open the PowerShell file with Pester tests and then wait a while for
+        // the extension to finish connecting to the server.
         await vscode.commands.executeCommand("vscode.open", vscode.Uri.file(pesterTests));
-        await client.getPowerShellVersionDetails(sessionId);
-        client.unregisterExternalExtension(sessionId);
+        await sleep(15000);
 
         // Now run the Pester tests, check the debugger started, wait a bit for
         // it to run, and then kill it for safety's sake.
         assert(await vscode.commands.executeCommand("PowerShell.RunPesterTestsFromFile"));
         assert(vscode.debug.activeDebugSession !== undefined);
         await sleep(5000);
         await vscode.debug.stopDebugging();
-    });
+    }).timeout(30000);
 });