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.
138 lines
4.3 KiB
Python
138 lines
4.3 KiB
Python
from collections.abc import Callable
|
|
|
|
import docker
|
|
import docker.errors
|
|
import pytest
|
|
from testcontainers.core.container import Network
|
|
from wiremock.client import (
|
|
Mapping,
|
|
Mappings,
|
|
Requests,
|
|
)
|
|
from wiremock.constants import Config
|
|
from wiremock.testing.testcontainer import WireMockContainer
|
|
|
|
from fixtures import reuse, types
|
|
from fixtures.logger import setup_logger
|
|
|
|
logger = setup_logger(__name__)
|
|
|
|
|
|
@pytest.fixture(name="zeus", scope="package")
|
|
def zeus(
|
|
network: Network,
|
|
request: pytest.FixtureRequest,
|
|
pytestconfig: pytest.Config,
|
|
) -> types.TestContainerDocker:
|
|
"""
|
|
Package-scoped fixture for running zeus
|
|
"""
|
|
|
|
def create() -> types.TestContainerDocker:
|
|
container = WireMockContainer(image="wiremock/wiremock:2.35.1-1", secure=False)
|
|
container.with_network(network)
|
|
container.start()
|
|
|
|
return types.TestContainerDocker(
|
|
id=container.get_wrapped_container().id,
|
|
host_configs={
|
|
"8080": types.TestContainerUrlConfig(
|
|
"http",
|
|
container.get_container_host_ip(),
|
|
container.get_exposed_port(8080),
|
|
)
|
|
},
|
|
container_configs={"8080": types.TestContainerUrlConfig("http", container.get_wrapped_container().name, 8080)},
|
|
)
|
|
|
|
def delete(container: types.TestContainerDocker):
|
|
client = docker.from_env()
|
|
try:
|
|
client.containers.get(container_id=container.id).stop()
|
|
client.containers.get(container_id=container.id).remove(v=True)
|
|
except docker.errors.NotFound:
|
|
logger.info(
|
|
"Skipping removal of Zeus, Zeus(%s) not found. Maybe it was manually removed?",
|
|
{"id": container.id},
|
|
)
|
|
|
|
def restore(cache: dict) -> types.TestContainerDocker:
|
|
return types.TestContainerDocker.from_cache(cache)
|
|
|
|
return reuse.wrap(
|
|
request,
|
|
pytestconfig,
|
|
"zeus",
|
|
lambda: types.TestContainerDocker(id="", host_configs={}, container_configs={}),
|
|
create,
|
|
delete,
|
|
restore,
|
|
)
|
|
|
|
|
|
@pytest.fixture(name="gateway", scope="package")
|
|
def gateway(
|
|
network: Network,
|
|
request: pytest.FixtureRequest,
|
|
pytestconfig: pytest.Config,
|
|
) -> types.TestContainerDocker:
|
|
"""
|
|
Package-scoped fixture for running gateway
|
|
"""
|
|
|
|
def create() -> types.TestContainerDocker:
|
|
container = WireMockContainer(image="wiremock/wiremock:2.35.1-1", secure=False)
|
|
container.with_exposed_ports(8080)
|
|
container.with_network(network)
|
|
container.start()
|
|
|
|
return types.TestContainerDocker(
|
|
id=container.get_wrapped_container().id,
|
|
host_configs={
|
|
"8080": types.TestContainerUrlConfig(
|
|
"http",
|
|
container.get_container_host_ip(),
|
|
container.get_exposed_port(8080),
|
|
)
|
|
},
|
|
container_configs={"8080": types.TestContainerUrlConfig("http", container.get_wrapped_container().name, 8080)},
|
|
)
|
|
|
|
def delete(container: types.TestContainerDocker):
|
|
client = docker.from_env()
|
|
try:
|
|
client.containers.get(container_id=container.id).stop()
|
|
client.containers.get(container_id=container.id).remove(v=True)
|
|
except docker.errors.NotFound:
|
|
logger.info(
|
|
"Skipping removal of Gateway, Gateway(%s) not found. Maybe it was manually removed?",
|
|
{"id": container.id},
|
|
)
|
|
|
|
def restore(cache: dict) -> types.TestContainerDocker:
|
|
return types.TestContainerDocker.from_cache(cache)
|
|
|
|
return reuse.wrap(
|
|
request,
|
|
pytestconfig,
|
|
"gateway",
|
|
lambda: types.TestContainerDocker(id="", host_configs={}, container_configs={}),
|
|
create,
|
|
delete,
|
|
restore,
|
|
)
|
|
|
|
|
|
@pytest.fixture(name="make_http_mocks", scope="function")
|
|
def make_http_mocks() -> Callable[[types.TestContainerDocker, list[Mapping]], None]:
|
|
def _make_http_mocks(container: types.TestContainerDocker, mappings: list[Mapping]) -> None:
|
|
Config.base_url = container.host_configs["8080"].get("/__admin")
|
|
|
|
for mapping in mappings:
|
|
Mappings.create_mapping(mapping=mapping)
|
|
|
|
yield _make_http_mocks
|
|
|
|
Mappings.delete_all_mappings()
|
|
Requests.reset_request_journal()
|