mirror of
https://github.com/hanzoai/o11y.git
synced 2026-10-15 12:58:33 +00:00
PandeyandGitHub
f21ce5b010
* chore(frontend): remove stale e2e scaffold frontend/e2e/ held an unused settings-only test-plan scaffold from Oct 2025. Active Playwright specs live at tests/e2e/. Drop the directory, the orphan playwright.config.ts, the @playwright/test dependency, and the tsconfig references that pinned them. * chore(e2e): migrate formatter from prettier to oxfmt Swap tests/e2e/ onto oxfmt — same tool the frontend adopted in #11057. Style matches frontend/.oxfmtrc.json (tabs, tabWidth:1) so the two TS trees stay visually consistent. Drops .prettierrc.json and .prettierignore, adds the fmt/fmt:check yarn scripts, and reformats the existing specs. * chore(e2e): migrate linter from eslint to oxlint Drop eslint + @typescript-eslint plugins in favour of oxlint 1.59 + tsgolint — same toolchain the frontend adopted in #10176. The .oxlintrc.json mirrors frontend/.oxlintrc.json with plugins scoped to a Playwright TS codebase (eslint, typescript, unicorn, import, promise). Divergence: eslint-plugin-playwright is not ported. Its rules depend on ESLint APIs (context.getAncestors) that oxlint's JS plugin shim does not implement, so the five playwright/* rules are dropped in this migration. * ci(e2e): add fmtlint job Mirror integrationci.yaml's fmtlint job for e2e. Runs oxfmt --check and oxlint on tests/e2e/ under the same safe-to-e2e label gating as the existing test job. * chore(integration): migrate python tooling from black/pylint/isort/autoflake to ruff Replace the four-tool stack with ruff — same motivation as the oxfmt/oxlint swap on the TS side. One tool covers formatting (ruff format), import sorting (I), unused-import/variable cleanup (F401/F841), and the pylint rules we actually care about (E/W/F/UP/B/PL). Rule set mirrors the intent of the prior pylint config: too-many-* checks and magic-value-comparison stay disabled, dangerous-default-value (now B006) stays muted. A handful of newly-surfaced codes (B011/B024/B905/E741/ UP047/PLC0206/PLW2901) are also muted to keep this a pure tool swap — each deserves its own review before enabling. Divergence: ruff caps line-length at 320, so the prior pylint value of 400 drops to 320. Nothing in tree exceeds 320, so no lines wrap. No changes to integrationci.yaml — both fmt/lint steps still call make py-fmt / make py-lint, which now dispatch to ruff. * chore(e2e): restore playwright lint rules via oxlint jsPlugin [email protected] was rewritten against ESLint 8's context.sourceCode.getAncestors() API, which oxlint's JS plugin shim exposes. The 0.16.x version previously ruled out by context.getAncestors() missing is no longer a blocker. Bump to 2.10.2, re-add it as a jsPlugin, and restore the five rules dropped in the initial oxlint migration: expect-expect, no-conditional-in-test, no-page-pause, no-wait-for-timeout, prefer-web-first-assertions. Rule count: 104 → 109. * chore(frontend): remove stale e2e prompt frontend/prompts/generate-e2e-test.md is leftover from the same Oct 2025 scaffold removed in ebf735dcc. It references frontend/e2e/utils/login.util.ts, which no longer exists, and is not wired into anything. * chore(e2e): make .env.local write layout explicit The single f-string with inline \n escapes read as a wall of text after ruff's line-length allowance collapsed it onto one line. Switch to a triple-quoted f-string so the generated .env.local structure is visible in source. Byte-for-byte identical output. * chore(e2e): write .env.local one key per line Open the file with a context manager and emit each key with its own f.write call. Same output as before, but each key-value pair is a discrete statement.
102 lines
2.9 KiB
Python
102 lines
2.9 KiB
Python
from collections.abc import Callable
|
|
from typing import TypeVar
|
|
|
|
import pytest
|
|
|
|
from fixtures.logger import setup_logger
|
|
|
|
logger = setup_logger(__name__)
|
|
|
|
T = TypeVar("T")
|
|
|
|
|
|
def reuse(request: pytest.FixtureRequest) -> bool:
|
|
return request.config.getoption("--reuse")
|
|
|
|
|
|
def teardown(request: pytest.FixtureRequest) -> bool:
|
|
return request.config.getoption("--teardown")
|
|
|
|
|
|
def get_cached_resource(pytestconfig: pytest.Config, key: str):
|
|
"""Get a resource from pytest cache by key."""
|
|
return pytestconfig.cache.get(key, None)
|
|
|
|
|
|
def set_cached_resource(pytestconfig: pytest.Config, key: str, value):
|
|
"""Set a resource in pytest cache by key."""
|
|
pytestconfig.cache.set(key, value)
|
|
|
|
|
|
def remove_cached_resource(pytestconfig: pytest.Config, key: str):
|
|
"""Remove a resource from pytest cache by key (set to None)."""
|
|
pytestconfig.cache.set(key, None)
|
|
|
|
|
|
def wrap( # pylint: disable=too-many-arguments,too-many-positional-arguments
|
|
request: pytest.FixtureRequest,
|
|
pytestconfig: pytest.Config,
|
|
key: str,
|
|
empty: Callable[[], T],
|
|
create: Callable[[], T],
|
|
delete: Callable[[T], None],
|
|
restore: Callable[[dict], T],
|
|
) -> T:
|
|
"""
|
|
Wraps a resource creation and cleanup process with reuse and teardown options.
|
|
- request: pytest.FixtureRequest
|
|
- pytestconfig: pytest.Config
|
|
- key: cache key for the resource
|
|
- empty: function to create an empty resource
|
|
- create: function to create the resource
|
|
- delete: function to delete the resource
|
|
- restore: function to restore resource from cache
|
|
"""
|
|
resource = empty()
|
|
|
|
if reuse(request):
|
|
existing_resource = pytestconfig.cache.get(key, None)
|
|
if existing_resource:
|
|
assert isinstance(existing_resource, dict)
|
|
logger.info("Reusing existing %s(%s)", key, existing_resource)
|
|
return restore(existing_resource)
|
|
|
|
if not teardown(request):
|
|
resource = create()
|
|
|
|
def finalizer():
|
|
nonlocal resource
|
|
if reuse(request):
|
|
logger.info(
|
|
"Skipping removal of %s",
|
|
resource.__log__() if hasattr(resource, "__log__") else resource,
|
|
)
|
|
return
|
|
|
|
if teardown(request):
|
|
existing_resource = pytestconfig.cache.get(key, None)
|
|
if not existing_resource:
|
|
logger.info(
|
|
"Skipping removal of %s, no existing %s found. Maybe you ran teardown without reuse?",
|
|
key,
|
|
key,
|
|
)
|
|
return
|
|
|
|
resource = restore(existing_resource)
|
|
|
|
logger.info(
|
|
"Removing %s",
|
|
resource.__log__() if hasattr(resource, "__log__") else resource,
|
|
)
|
|
delete(resource)
|
|
|
|
pytestconfig.cache.set(key, None)
|
|
|
|
request.addfinalizer(finalizer)
|
|
|
|
if reuse(request):
|
|
pytestconfig.cache.set(key, resource.__cache__() if hasattr(resource, "__cache__") else resource)
|
|
|
|
return resource
|