cd9f023f3d
prd-number-check / require-numbered-prds (pull_request) Successful in 11s
tracker-policy-pr / check-pr (pull_request) Successful in 14s
test / unit (pull_request) Successful in 59s
test / integration-docker (pull_request) Successful in 1m6s
test / coverage (push) Successful in 21s
test / image-input-builds (push) Successful in 44s
test / image-input-builds (pull_request) Successful in 1m15s
test / unit (push) Successful in 57s
test / coverage (pull_request) Successful in 20s
lint / lint (push) Successful in 1m3s
Update Quality Badges / update-badges (push) Successful in 1m12s
test / integration-docker (push) Successful in 1m0s
`doctor` told users to run `./cli.py backend setup`. cli.py is a four-line wrapper at the repo root that calls bot_bottle.cli:main, and it does not ship — [tool.setuptools.packages.find] includes only bot_bottle*, so anyone who installed rather than cloned has no such file. Confirmed against a real install: the user's tree contains exactly one executable, `bot-bottle`, and no cli.py anywhere, while doctor recommended `./cli.py` three times. Invisible in development, where ./cli.py works fine from a checkout, which is why only a clean-install test surfaced it. The two entry points are the same code, so the fix is to name the one that always exists. 141 replacements across 45 files: the runtime messages that caused this, plus README, docs, PRDs, research notes and test prose, so nothing teaches the invocation a user cannot run. scripts/demo.sh is deliberately untouched — it *executes* ./cli.py from a checkout, where that is the correct and available path. Verified end to end: a sandbox install now reports "Run: bot-bottle backend setup --backend=firecracker", and bot-bottle is on that user's PATH. Unit suite unchanged against the pre-existing baseline. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01WEfZZhakx13bxTfXcZCoS5
72 lines
2.7 KiB
Python
72 lines
2.7 KiB
Python
"""Backend selection + readiness-aware skip guards for the integration suite.
|
|
|
|
Each integration test targets the backend named by ``BOT_BOTTLE_BACKEND``
|
|
(default ``docker``) and gates on that backend's full readiness check —
|
|
``is_backend_ready()`` (equivalent to ``bot-bottle backend status``), not just
|
|
a binary-on-PATH probe. When the backend is not ready, diagnostic output is
|
|
printed during test discovery so the operator sees a concrete reason for each
|
|
skip.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import unittest
|
|
|
|
from bot_bottle.backend import is_backend_ready
|
|
|
|
# Default when ``BOT_BOTTLE_BACKEND`` is unset. Docker preserves the historical
|
|
# Docker-backed CI path (and mirrors the pin in ``test_sandbox_escape``).
|
|
DEFAULT_BACKEND = "docker"
|
|
|
|
|
|
def selected_backend() -> str:
|
|
"""The backend this test run targets, from ``BOT_BOTTLE_BACKEND``.
|
|
|
|
Mirrors the CLI's env selector; unset means ``docker`` so an
|
|
unconfigured run behaves exactly as the suite did before backends were
|
|
pluggable.
|
|
"""
|
|
return os.environ.get("BOT_BOTTLE_BACKEND") or DEFAULT_BACKEND
|
|
|
|
|
|
def skip_unless_backend(backend: str):
|
|
"""Skip a backend-specific test unless the selected backend matches AND
|
|
that backend is fully ready.
|
|
|
|
Docker-implementation tests (``DockerBroker``, ``DockerGateway``,
|
|
``backend.docker.*``) use ``skip_unless_backend("docker")`` so they no-op
|
|
under a run targeting a different backend instead of testing Docker
|
|
internals that run doesn't exercise — the guard reads
|
|
``BOT_BOTTLE_BACKEND`` rather than "is Docker installed".
|
|
|
|
When the backend is not ready, ``status()`` output is printed so the
|
|
operator sees a concrete diagnostic for each skipped test module.
|
|
"""
|
|
sel = selected_backend()
|
|
if sel != backend:
|
|
return unittest.skip(
|
|
f"backend {backend!r} not selected (BOT_BOTTLE_BACKEND={sel})"
|
|
)
|
|
return unittest.skipUnless(
|
|
is_backend_ready(backend, quiet=False),
|
|
f"{backend} backend not ready",
|
|
)
|
|
|
|
|
|
def skip_unless_selected_backend_available():
|
|
"""Skip a backend-agnostic test unless the *selected* backend is fully ready.
|
|
|
|
The test then runs through whichever backend ``BOT_BOTTLE_BACKEND`` names,
|
|
gated on that backend's full status() check (e.g. daemon reachable, TAP
|
|
pool present for Firecracker) rather than just a binary-on-PATH probe.
|
|
|
|
When the backend is not ready, ``status()`` output is printed so the
|
|
operator sees a concrete diagnostic for each skipped test module.
|
|
"""
|
|
backend = selected_backend()
|
|
return unittest.skipUnless(
|
|
is_backend_ready(backend, quiet=False),
|
|
f"selected backend {backend!r} not ready",
|
|
)
|