didericis
a5910696a5
CI's unit + coverage jobs failed with `FileNotFoundError: 'container'`: three tests reached the real Apple CLI, which exists on a macOS dev host but not on the Linux runner. They passed locally for that reason alone — and two of them were quietly creating real Apple networks on the dev host as a side effect. - `test_enumerate_active_is_empty_while_disabled` asserted the disabled-era stub and called `enumerate_active()` unmocked. The backend launches bottles again, so it now covers the real enumeration: slug parsing, exclusion of the shared gateway/orchestrator singletons, and the CLI-failure path. - The two orchestrator tests patched `orchestrator_service.container_mod`, but `_run_orchestrator_container` reaches the CLI through `ensure_networks`, which is imported from the gateway module and resolves `container_mod` in *its* namespace. Patch the imported name instead. Adds a test that the networks exist before the orchestrator runs — the ordering the escaped call was hiding. Verified by reproducing the CI environment locally (`PATH` without the `container` binary): 3 failures before, 1818 passing after. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
78 lines
2.9 KiB
Python
78 lines
2.9 KiB
Python
"""Unit: Apple Container cleanup/enumeration helpers."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import unittest
|
|
from unittest.mock import patch
|
|
|
|
from bot_bottle.backend.macos_container import cleanup, enumerate as enum_mod
|
|
from bot_bottle.backend.macos_container.bottle_cleanup_plan import (
|
|
MacosContainerBottleCleanupPlan,
|
|
)
|
|
|
|
|
|
class TestMacosContainerCleanup(unittest.TestCase):
|
|
def test_lists_prefixed_containers(self):
|
|
completed = cleanup.subprocess.CompletedProcess(
|
|
args=[],
|
|
returncode=0,
|
|
stdout="bot-bottle-a\nbot-bottle-b\nother\n",
|
|
stderr="",
|
|
)
|
|
with patch.object(cleanup.subprocess, "run", return_value=completed):
|
|
self.assertEqual(
|
|
["bot-bottle-a", "bot-bottle-b"],
|
|
cleanup._list_prefixed_containers(),
|
|
)
|
|
|
|
def test_cleanup_deletes_containers_and_networks(self):
|
|
plan = MacosContainerBottleCleanupPlan(
|
|
containers=("bot-bottle-a",),
|
|
networks=("bot-bottle-net-a",),
|
|
)
|
|
with patch.object(cleanup.subprocess, "run") as run:
|
|
cleanup.cleanup(plan)
|
|
self.assertEqual(
|
|
["container", "delete", "--force", "bot-bottle-a"],
|
|
run.call_args_list[0].args[0],
|
|
)
|
|
self.assertEqual(
|
|
["container", "network", "delete", "bot-bottle-net-a"],
|
|
run.call_args_list[1].args[0],
|
|
)
|
|
|
|
|
|
class TestMacosContainerEnumerate(unittest.TestCase):
|
|
"""The backend launches bottles again (PRD 0070), so enumeration is real
|
|
rather than the disabled-era stub. These must not shell out: `container`
|
|
does not exist on the Linux CI host."""
|
|
|
|
def _enumerate(self, stdout: str, returncode: int = 0):
|
|
completed = enum_mod.subprocess.CompletedProcess(
|
|
args=[], returncode=returncode, stdout=stdout, stderr="",
|
|
)
|
|
with patch.object(enum_mod.subprocess, "run", return_value=completed), \
|
|
patch.object(enum_mod, "read_metadata", return_value=None):
|
|
return enum_mod.enumerate_active()
|
|
|
|
def test_lists_agent_containers_by_slug(self):
|
|
agents = self._enumerate("bot-bottle-dev-abc\nunrelated\n")
|
|
self.assertEqual(["dev-abc"], [a.slug for a in agents])
|
|
self.assertEqual(["macos-container"], [a.backend_name for a in agents])
|
|
|
|
def test_excludes_the_shared_singletons(self):
|
|
"""The gateway and control plane share the bot-bottle- prefix but are
|
|
infrastructure — listing them would invent an agent per host."""
|
|
agents = self._enumerate(
|
|
"bot-bottle-mac-gateway\nbot-bottle-mac-orchestrator\n"
|
|
"bot-bottle-dev-abc\n"
|
|
)
|
|
self.assertEqual(["dev-abc"], [a.slug for a in agents])
|
|
|
|
def test_empty_when_the_cli_fails(self):
|
|
self.assertEqual([], self._enumerate("", returncode=1))
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|