Skip to content

fix(testing): reduce flakiness in extension e2e tests #5481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Aug 22, 2022
Merged

fix(testing): reduce flakiness in extension e2e tests #5481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b14f9e0
fix(e2e): update test extension
jsjoeio Aug 19, 2022
d8ab7d7
feat(e2e): add test extension methods to model
jsjoeio Aug 19, 2022
1be591c
fix(e2e): update extension tests
jsjoeio Aug 19, 2022
d136b13
Update test/e2e/models/CodeServer.ts
jsjoeio Aug 22, 2022
4dc187a
Update test/e2e/models/CodeServer.ts
jsjoeio Aug 22, 2022
e36a876
fixup
jsjoeio Aug 22, 2022
7906ebf
try asher approach
jsjoeio Aug 22, 2022
9c71a39
fixup: refactor and delete old methods
jsjoeio Aug 22, 2022
aea4c56
try again joe
jsjoeio Aug 22, 2022
567eb83
Update test/e2e/extensions.test.ts
jsjoeio Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions test/e2e/extensions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ function runTestExtensionTests() {
test("should have access to VSCODE_PROXY_URI", async ({ codeServerPage }) => {
const address = await getMaybeProxiedCodeServer(codeServerPage)

await codeServerPage.waitForTestExtensionLoaded()
await codeServerPage.executeCommandViaMenus("code-server: Get proxy URI")

const text = await codeServerPage.page.locator(".notification-list-item-message").textContent()
await codeServerPage.page.waitForSelector("text=proxyUri", { timeout: 3000 })
const text = await codeServerPage.page.locator("text=proxyUri").first().textContent()
// Remove end slash in address
const normalizedAddress = address.replace(/\/+$/, "")
expect(text).toBe(`${normalizedAddress}/proxy/{{port}}`)
expect(text).toBe(`Info: proxyUri: ${normalizedAddress}/proxy/{{port}}`)
})
}

Expand Down
3 changes: 2 additions & 1 deletion test/e2e/extensions/test-extension/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import * as vscode from "vscode"

export function activate(context: vscode.ExtensionContext) {
vscode.window.showInformationMessage("test extension loaded")
context.subscriptions.push(
vscode.commands.registerCommand("codeServerTest.proxyUri", () => {
if (process.env.VSCODE_PROXY_URI) {
vscode.window.showInformationMessage(process.env.VSCODE_PROXY_URI)
vscode.window.showInformationMessage(`proxyUri: ${process.env.VSCODE_PROXY_URI}`)
} else {
vscode.window.showErrorMessage("No proxy URI was set")
}
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/extensions/test-extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "0.0.1",
"publisher": "coder",
"activationEvents": [
"onCommand:codeServerTest.proxyUri"
"onStartupFinished"
],
"engines": {
"vscode": "^1.56.0"
Expand Down
10 changes: 10 additions & 0 deletions test/e2e/models/CodeServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,16 @@ export class CodeServerPage {
return visible
}

/**
* Checks if the test extension loaded
*/
async waitForTestExtensionLoaded(): Promise<void> {
const selector = "text=test extension loaded"
this.codeServer.logger.debug("Waiting for test extension to load...")

await this.page.waitForSelector(selector)
}

/**
* Focuses the integrated terminal by navigating through the command palette.
*
Expand Down