fix: align skip-guard tests with is_backend_ready and drop unused import
tracker-policy-pr / check-pr (pull_request) Successful in 14s
test / integration-docker (pull_request) Successful in 16s
test / unit (pull_request) Successful in 37s
lint / lint (push) Successful in 53s
test / integration-firecracker (pull_request) Successful in 3m18s
test / coverage (pull_request) Failing after 35s
test / publish-infra (pull_request) Has been skipped
tracker-policy-pr / check-pr (pull_request) Successful in 14s
test / integration-docker (pull_request) Successful in 16s
test / unit (pull_request) Successful in 37s
lint / lint (push) Successful in 53s
test / integration-firecracker (pull_request) Successful in 3m18s
test / coverage (pull_request) Failing after 35s
test / publish-infra (pull_request) Has been skipped
tests/_backend.py imported is_backend_available but never called it, causing a pyright reportUnusedImport error. Remove the unused import. test_backend_skip_guards.py was patching tests._backend.has_backend but _backend.py calls is_backend_ready — the mock never intercepted the real call, producing AttributeError at test runtime. Update all patch targets to is_backend_ready and add quiet=False to the assert_called_once_with assertion to match the actual call signature. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
+1
-1
@@ -13,7 +13,7 @@ from __future__ import annotations
|
|||||||
import os
|
import os
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from bot_bottle.backend import is_backend_available, is_backend_ready
|
from bot_bottle.backend import is_backend_ready
|
||||||
|
|
||||||
# Default when ``BOT_BOTTLE_BACKEND`` is unset. Docker preserves the historical
|
# Default when ``BOT_BOTTLE_BACKEND`` is unset. Docker preserves the historical
|
||||||
# Docker-backed CI path (and mirrors the pin in ``test_sandbox_escape``).
|
# Docker-backed CI path (and mirrors the pin in ``test_sandbox_escape``).
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
"""Tests for the backend-aware skip guards in ``tests/_backend.py``.
|
"""Tests for the backend-aware skip guards in ``tests/_backend.py``.
|
||||||
|
|
||||||
The guards delegate their readiness check to
|
The guards delegate their readiness check to
|
||||||
``bot_bottle.backend.has_backend`` (the probe behind ``./cli.py backend
|
``bot_bottle.backend.is_backend_ready`` (the probe behind ``./cli.py backend
|
||||||
status``); here that probe is mocked so the unit job asserts the
|
status``); here that probe is mocked so the unit job asserts the
|
||||||
selection/skip logic without either backend present on the runner.
|
selection/skip logic without either backend present on the runner.
|
||||||
"""
|
"""
|
||||||
@@ -41,20 +41,20 @@ class TestSkipUnlessBackend(unittest.TestCase):
|
|||||||
def test_skips_when_other_backend_selected(self):
|
def test_skips_when_other_backend_selected(self):
|
||||||
# A different backend is selected — no host probe needed, skip.
|
# A different backend is selected — no host probe needed, skip.
|
||||||
with patch.dict(os.environ, {"BOT_BOTTLE_BACKEND": "firecracker"}, clear=True), \
|
with patch.dict(os.environ, {"BOT_BOTTLE_BACKEND": "firecracker"}, clear=True), \
|
||||||
patch("tests._backend.has_backend") as has:
|
patch("tests._backend.is_backend_ready") as has:
|
||||||
decorated = skip_unless_backend("docker")(_new_case())
|
decorated = skip_unless_backend("docker")(_new_case())
|
||||||
self.assertTrue(_skipped(decorated))
|
self.assertTrue(_skipped(decorated))
|
||||||
has.assert_not_called()
|
has.assert_not_called()
|
||||||
|
|
||||||
def test_runs_when_selected_and_available(self):
|
def test_runs_when_selected_and_available(self):
|
||||||
with patch.dict(os.environ, {"BOT_BOTTLE_BACKEND": "docker"}, clear=True), \
|
with patch.dict(os.environ, {"BOT_BOTTLE_BACKEND": "docker"}, clear=True), \
|
||||||
patch("tests._backend.has_backend", return_value=True):
|
patch("tests._backend.is_backend_ready", return_value=True):
|
||||||
decorated = skip_unless_backend("docker")(_new_case())
|
decorated = skip_unless_backend("docker")(_new_case())
|
||||||
self.assertFalse(_skipped(decorated))
|
self.assertFalse(_skipped(decorated))
|
||||||
|
|
||||||
def test_skips_when_selected_but_unavailable(self):
|
def test_skips_when_selected_but_unavailable(self):
|
||||||
with patch.dict(os.environ, {"BOT_BOTTLE_BACKEND": "docker"}, clear=True), \
|
with patch.dict(os.environ, {"BOT_BOTTLE_BACKEND": "docker"}, clear=True), \
|
||||||
patch("tests._backend.has_backend", return_value=False):
|
patch("tests._backend.is_backend_ready", return_value=False):
|
||||||
decorated = skip_unless_backend("docker")(_new_case())
|
decorated = skip_unless_backend("docker")(_new_case())
|
||||||
self.assertTrue(_skipped(decorated))
|
self.assertTrue(_skipped(decorated))
|
||||||
|
|
||||||
@@ -62,14 +62,14 @@ class TestSkipUnlessBackend(unittest.TestCase):
|
|||||||
class TestSkipUnlessSelectedBackendAvailable(unittest.TestCase):
|
class TestSkipUnlessSelectedBackendAvailable(unittest.TestCase):
|
||||||
def test_runs_when_selected_backend_available(self):
|
def test_runs_when_selected_backend_available(self):
|
||||||
with patch.dict(os.environ, {"BOT_BOTTLE_BACKEND": "firecracker"}, clear=True), \
|
with patch.dict(os.environ, {"BOT_BOTTLE_BACKEND": "firecracker"}, clear=True), \
|
||||||
patch("tests._backend.has_backend", return_value=True) as has:
|
patch("tests._backend.is_backend_ready", return_value=True) as has:
|
||||||
decorated = skip_unless_selected_backend_available()(_new_case())
|
decorated = skip_unless_selected_backend_available()(_new_case())
|
||||||
self.assertFalse(_skipped(decorated))
|
self.assertFalse(_skipped(decorated))
|
||||||
has.assert_called_once_with("firecracker")
|
has.assert_called_once_with("firecracker", quiet=False)
|
||||||
|
|
||||||
def test_skips_when_selected_backend_unavailable(self):
|
def test_skips_when_selected_backend_unavailable(self):
|
||||||
with patch.dict(os.environ, {"BOT_BOTTLE_BACKEND": "firecracker"}, clear=True), \
|
with patch.dict(os.environ, {"BOT_BOTTLE_BACKEND": "firecracker"}, clear=True), \
|
||||||
patch("tests._backend.has_backend", return_value=False):
|
patch("tests._backend.is_backend_ready", return_value=False):
|
||||||
decorated = skip_unless_selected_backend_available()(_new_case())
|
decorated = skip_unless_selected_backend_available()(_new_case())
|
||||||
self.assertTrue(_skipped(decorated))
|
self.assertTrue(_skipped(decorated))
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user