Commit 3697572

committed

Fix race condition in RunPesterTestsFromFile test

1 parent c67256e commit 3697572Copy full SHA for 3697572

File tree

2 files changed

+25

-11

lines changed

src/features
- PesterTests.ts
test/features
- RunCode.test.ts

2 files changed

+25

-11

lines changed

`‎src/features/PesterTests.ts‎`

Lines changed: 5 additions & 6 deletions

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

`‎test/features/RunCode.test.ts‎`

Lines changed: 20 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,11 @@`
`4`	`4`	`import * as assert from "assert";`
`5`	`5`	`import * as fs from "fs";`
`6`	`6`	`import * as path from "path";`
`7`		`-import { suiteSetup } from "mocha";`
`8`	`7`	`import rewire = require("rewire");`
`9`	`8`	`import vscode = require("vscode");`
`10`	`9`	`import utils = require("../utils");`
	`10`	`+import { sleep } from "../../src/utils";`
	`11`	`+import { IPowerShellExtensionClient } from "../../src/features/ExternalApi";`
`11`	`12`
`12`	`13`	`// Setup function that is not exported.`
`13`	`14`	`const customViews = rewire("../../src/features/RunCode");`
`@@ -19,8 +20,6 @@ enum LaunchType {`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`suite("RunCode tests", () => {`
`22`		`- suiteSetup(utils.ensureExtensionIsActivated);`
`23`		`-`
`24`	`23`	`test("Can create the launch config", () => {`
`25`	`24`	`const commandToRun: string = "Invoke-Build";`
`26`	`25`	`const args: string[] = ["Clean"];`
`@@ -45,8 +44,24 @@ suite("RunCode tests", () => {`
`45`	`44`	`test("Can run Pester tests from file", async () => {`
`46`	`45`	`const pesterTests = path.resolve(__dirname, "../../../examples/Tests/SampleModule.Tests.ps1");`
`47`	`46`	`assert(fs.existsSync(pesterTests));`
	`47`	`+`
	`48`	`+ // Get interface to extension.`
	`49`	`+ const extension = await utils.ensureExtensionIsActivated();`
	`50`	`+ const client = extension!.exports as IPowerShellExtensionClient;`
	`51`	`+ const sessionId = client.registerExternalExtension(utils.extensionId);`
	`52`	`+`
	`53`	`+ // Force PowerShell extension to finish connecting. This is necessary`
	`54`	`+ // because we can't start the PowerShell debugger until the session is`
	`55`	`+ // connected, which is different from the extension being activated. We`
	`56`	`+ // also need to open the file so the command has it as its argument.`
`48`	`57`	`await vscode.commands.executeCommand("vscode.open", vscode.Uri.file(pesterTests));`
	`58`	`+ await client.getPowerShellVersionDetails(sessionId);`
	`59`	`+`
	`60`	`+ // Now run the Pester tests.`
`49`	`61`	`assert(await vscode.commands.executeCommand("PowerShell.RunPesterTestsFromFile"));`
`50`		`- // Start up can take some time...so set the timeout to 30 seconds.`
`51`		`- }).timeout(30000);`
	`62`	`+ assert(vscode.debug.activeDebugSession !== undefined);`
	`63`	`+ await sleep(5000);`
	`64`	`+ await vscode.debug.stopDebugging(vscode.debug.activeDebugSession);`
	`65`	`+ // PowerShell can take a while, so set the timeout to a full minute.`
	`66`	`+ }).timeout(60000);`
`52`	`67`	`});`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 3697572

File tree

2 files changed

2 files changed

`‎src/features/PesterTests.ts‎`

`‎test/features/RunCode.test.ts‎`

0 commit comments