-
Notifications
You must be signed in to change notification settings - Fork 742
tests: use the same browser instance across tests and better use explicit resource management #2901
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.
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
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
fe24c7b
test: use the same browser instance across tests
iuioiua 72c973e
work
iuioiua 3049b2f
tweak
iuioiua a3c24a1
work
iuioiua 8364d95
tweak
iuioiua 8a62637
Merge branch 'main' into browser-instance
iuioiua beaeea3
fix
iuioiua 754bed1
Merge branch 'main' into browser-instance
iuioiua ccc4286
Merge branch 'main' into browser-instance
iuioiua 52c3a53
Merge branch 'main' into browser-instance
marvinhagemeister File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| import { App, getIslandRegistry, setBuildCache } from "../src/app.ts"; | ||
| import { launch, type Page } from "@astral/astral"; | ||
| import * as colors from "@std/fmt/colors"; | ||
| import { type Document, DOMParser, HTMLElement } from "linkedom"; | ||
| import { DOMParser, HTMLElement } from "linkedom"; | ||
| import { Builder } from "../src/dev/builder.ts"; | ||
| import { TextLineStream } from "@std/streams/text-line-stream"; | ||
| import * as path from "@std/path"; | ||
|
|
@@ -28,6 +28,23 @@ import { NodeProcess } from "./fixtures_islands/NodeProcess.tsx"; | |
| import { FreshAttrs } from "./fixtures_islands/FreshAttrs.tsx"; | ||
| import { OptOutPartialLink } from "./fixtures_islands/OptOutPartialLink.tsx"; | ||
|
|
||
| /** | ||
| * If on Linux, disable `AppArmor` before running tests: | ||
| * ```sh | ||
| * echo 0 | sudo tee /proc/sys/kernel/apparmor_restrict_unprivileged_userns | ||
iuioiua marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| * ``` | ||
| * | ||
| * @see {@link https://github.com/lino-levan/astral#no-usable-sandbox-with-user-namespace-cloning-enabled} | ||
| */ | ||
| const browser = await launch({ | ||
| args: ["--window-size=1280,720"], | ||
| headless: true, | ||
| }); | ||
|
|
||
| addEventListener("unload", async () => { | ||
| await browser.close(); | ||
| }); | ||
|
||
|
|
||
| export function getIsland(pathname: string) { | ||
| return path.join( | ||
| import.meta.dirname!, | ||
|
|
@@ -79,44 +96,22 @@ export async function withBrowserApp( | |
| fn: (page: Page, address: string) => void | Promise<void>, | ||
| ) { | ||
| const aborter = new AbortController(); | ||
| const server = Deno.serve({ | ||
| await using server = Deno.serve({ | ||
| hostname: "localhost", | ||
| port: 0, | ||
| signal: aborter.signal, | ||
| }, await app.handler()); | ||
|
|
||
| const browser = await launch({ | ||
| args: [ | ||
| "--window-size=1280,720", | ||
| ...((Deno.env.get("CI") && Deno.build.os === "linux") | ||
| ? ["--no-sandbox"] | ||
| : []), | ||
| ], | ||
| headless: true, | ||
| }); | ||
|
|
||
| const page = await browser.newPage(); | ||
| try { | ||
| await using page = await browser.newPage(); | ||
| await fn(page, `http://localhost:${server.addr.port}`); | ||
| } finally { | ||
| await page.close(); | ||
| await browser.close(); | ||
| aborter.abort(); | ||
| await server?.finished; | ||
| } | ||
| } | ||
|
|
||
| export async function withBrowser(fn: (page: Page) => void | Promise<void>) { | ||
| const browser = await launch({ | ||
| args: [ | ||
| "--window-size=1280,7201", | ||
| ...((Deno.env.get("CI") && Deno.build.os === "linux") | ||
| ? ["--no-sandbox"] | ||
| : []), | ||
| ], | ||
| headless: true, | ||
| }); | ||
| const page = await browser.newPage(); | ||
| await using page = await browser.newPage(); | ||
| try { | ||
| await fn(page); | ||
| } catch (err) { | ||
|
|
@@ -126,9 +121,6 @@ export async function withBrowser(fn: (page: Page) => void | Promise<void>) { | |
| // deno-lint-ignore no-console | ||
| console.log(html); | ||
| throw err; | ||
| } finally { | ||
| await page.close(); | ||
| await browser.close(); | ||
| } | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is worth trying.