diff --git a/runner/harness/browser.py b/runner/harness/browser.py new file mode 100644 index 0000000..8333a2b --- /dev/null +++ b/runner/harness/browser.py @@ -0,0 +1,56 @@ +"""Playwright helpers for Phase-2 recipe tests (plan §4.2). + +Centralizes the `page.goto(...)` retry loop that absorbs transient network errors (F2-3 / F2-5): +Playwright's `page.goto` raises `PlaywrightError` on transport-level failures (`net::ERR_*`, +connection resets, CDP target gone) — those escape a naive loop that only retries on status +mismatches. Wrap every install-overlay `page.goto` in this helper so transient errors retry +without weakening the underlying assertion (same pattern as F1e-1's `exec_in_app` poll+raise +hardening). +""" + +from __future__ import annotations + +import time + + +def goto_with_retry(page, url, *, deadline_seconds: int = 120, accept_statuses=(200, 304), + goto_timeout_ms: int = 30_000, wait_until: str = "domcontentloaded"): + """Poll `page.goto(url)` until status is in `accept_statuses` OR the deadline expires. + + Returns the final Playwright response. Raises AssertionError if the deadline expires without + a successful status. Each iteration catches `PlaywrightError` (and any other exception) so + transient network failures retry rather than fail the test. + + Use case: recipe install overlays where the app's HTTP layer may be up (status 200 to + /healthz or generic readiness) but the requested route is still registering (404), or + Playwright's CDP connection transiently flakes (`net::ERR_NETWORK_CHANGED`). + """ + # Imported lazily so this module can be imported without playwright at unit-test time. + try: + from playwright.sync_api import Error as PlaywrightError + except ImportError: # pragma: no cover — playwright is always installed in cc-ci-run + PlaywrightError = Exception # noqa: N806 + + deadline = time.time() + deadline_seconds + resp = None + last_status = 0 + last_err = "" + attempts = 0 + while time.time() < deadline: + attempts += 1 + try: + resp = page.goto(url, wait_until=wait_until, timeout=goto_timeout_ms) + except PlaywrightError as e: + last_err = str(e) + resp = None + last_status = 0 + else: + last_status = resp.status if resp is not None else 0 + if last_status in accept_statuses: + return resp + time.sleep(3) + raise AssertionError( + f"page.goto({url}) never returned a status in {accept_statuses} after " + f"{attempts} attempts ({deadline_seconds}s); last status={last_status}, " + f"last error={last_err or 'none'}" + ) diff --git a/tests/cryptpad/test_install.py b/tests/cryptpad/test_install.py index fa1ce83..9038d60 100644 --- a/tests/cryptpad/test_install.py +++ b/tests/cryptpad/test_install.py @@ -8,7 +8,7 @@ import os import sys sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "runner")) -from harness import generic, lifecycle # noqa: E402 +from harness import browser as harness_browser, generic, lifecycle # noqa: E402 def test_serving_and_content(live_app, meta): @@ -29,7 +29,10 @@ def test_serving_and_content(live_app, meta): try: ctx = browser.new_context(ignore_https_errors=True) page = ctx.new_page() - resp = page.goto(url, wait_until="load", timeout=60000) + # F2-3 hardening centralized in harness.browser + resp = harness_browser.goto_with_retry( + page, url, accept_statuses=(200, 304), goto_timeout_ms=60_000, wait_until="load" + ) assert resp is not None and resp.status in ( 200, 304, diff --git a/tests/custom-html/playwright/test_browser_smoke.py b/tests/custom-html/playwright/test_browser_smoke.py index 5248c06..b12a69c 100644 --- a/tests/custom-html/playwright/test_browser_smoke.py +++ b/tests/custom-html/playwright/test_browser_smoke.py @@ -10,6 +10,12 @@ later non-lifecycle browser flow (e.g. a content-management UI) has its home alr from __future__ import annotations +import os +import sys + +sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "..", "runner")) +from harness import browser as harness_browser # noqa: E402 + def test_browser_renders_html(live_app): """Browser-render the served root page and assert the HTML loads with no console errors.""" @@ -26,7 +32,10 @@ def test_browser_renders_html(live_app): "console", lambda msg: console_errors.append(msg.text) if msg.type == "error" else None, ) - resp = page.goto(url, wait_until="load", timeout=30_000) + # F2-3 hardening (status mismatch + PlaywrightError retries) + resp = harness_browser.goto_with_retry( + page, url, accept_statuses=(200,), wait_until="load" + ) assert resp is not None and resp.status == 200, f"page status {resp and resp.status}" html = page.content() assert "