didericis
9f2498397f
PRD 0018 chunk 4. `claude-bottle cleanup` now derives its work
from `docker compose ls --all --format json`, filtered to projects
whose name starts with `claude-bottle-`. Per project: one `compose
down --volumes` removes the containers + the compose-managed
networks atomically.
The plan also enumerates three fallback buckets:
- Stray containers — `claude-bottle-*` containers with no
`com.docker.compose.project` label (left over from pre-compose
code paths). Cleared via `docker rm -f`.
- Stray networks — `claude-bottle-*` networks with no compose
project label. Cleared via `docker network rm`.
- Orphan state dirs — per-bottle `~/.claude-bottle/state/<id>/`
dirs with no live project AND no `.preserve` marker. The
`.preserve` marker (capability-block or auto-preserve-on-crash)
explicitly opts-out of reaping; manual `rm -rf` is the only
path for preserved state.
cli/cleanup.py collapses to a single y/N prompt — backend.prepare_cleanup
returns everything in one plan, backend.cleanup processes everything,
no more double-prompt for state. The CLI-side state-dir enumeration
+ `_state_summary` flags from PR #25 are gone; the backend's
orphan-detection rules subsume them.
103 lines
3.6 KiB
Python
103 lines
3.6 KiB
Python
"""Unit: backend/docker/cleanup orphan-state-dir detection.
|
|
|
|
PRD 0018 chunk 4. The orphan-state-dir rule has three categories:
|
|
- LIVE: a compose project with the matching name is up → keep
|
|
- PRESERVED: state dir carries `.preserve` → keep (resume target)
|
|
- ORPHAN: neither → reap
|
|
|
|
These are the cases the test exercises. The compose-project +
|
|
container/network enumeration is left to the integration tests
|
|
because it requires a real docker daemon."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import tempfile
|
|
import unittest
|
|
from pathlib import Path
|
|
|
|
from claude_bottle import supervise
|
|
from claude_bottle.backend.docker import bottle_state
|
|
from claude_bottle.backend.docker.cleanup import _list_orphan_state_dirs
|
|
|
|
|
|
class _FakeHomeMixin:
|
|
def _setup_fake_home(self) -> None:
|
|
self._tmp = tempfile.TemporaryDirectory(prefix="docker-cleanup-test.")
|
|
original = supervise.claude_bottle_root
|
|
|
|
def fake_root() -> Path:
|
|
return Path(self._tmp.name) / ".claude-bottle"
|
|
|
|
supervise.claude_bottle_root = fake_root # type: ignore[assignment]
|
|
self._restore = lambda: setattr(supervise, "claude_bottle_root", original)
|
|
|
|
def _teardown_fake_home(self) -> None:
|
|
self._restore()
|
|
self._tmp.cleanup()
|
|
|
|
|
|
class TestOrphanStateDirs(_FakeHomeMixin, unittest.TestCase):
|
|
def setUp(self) -> None:
|
|
self._setup_fake_home()
|
|
|
|
def tearDown(self) -> None:
|
|
self._teardown_fake_home()
|
|
|
|
def test_no_state_root_returns_empty(self):
|
|
self.assertEqual([], _list_orphan_state_dirs(set()))
|
|
|
|
def test_state_dir_with_no_live_no_preserve_is_orphan(self):
|
|
# Just touch the dir; no metadata, no preserve marker — the
|
|
# exact orphan shape.
|
|
bottle_state.write_per_bottle_dockerfile("solo-aaa", "FROM x\n")
|
|
self.assertEqual(
|
|
["solo-aaa"],
|
|
_list_orphan_state_dirs(set()),
|
|
)
|
|
|
|
def test_live_project_skips_dir(self):
|
|
# Live project means the bottle is currently running under
|
|
# compose — never reap.
|
|
bottle_state.write_per_bottle_dockerfile("live-bbb", "FROM x\n")
|
|
self.assertEqual(
|
|
[],
|
|
_list_orphan_state_dirs({"claude-bottle-live-bbb"}),
|
|
)
|
|
|
|
def test_preserve_marker_skips_dir(self):
|
|
# Preserve marker = capability-block or crash auto-preserve;
|
|
# the user explicitly wanted this dir kept for `resume`.
|
|
bottle_state.write_per_bottle_dockerfile("kept-ccc", "FROM x\n")
|
|
bottle_state.mark_preserved("kept-ccc")
|
|
self.assertEqual(
|
|
[],
|
|
_list_orphan_state_dirs(set()),
|
|
)
|
|
|
|
def test_preserve_overrides_no_live_project(self):
|
|
# Even without a live project, a preserve marker keeps it.
|
|
bottle_state.write_per_bottle_dockerfile("kept-ddd", "FROM x\n")
|
|
bottle_state.mark_preserved("kept-ddd")
|
|
self.assertEqual([], _list_orphan_state_dirs(set()))
|
|
|
|
def test_mixed_set_categorized_correctly(self):
|
|
bottle_state.write_per_bottle_dockerfile("orphan-eee", "FROM x\n")
|
|
bottle_state.write_per_bottle_dockerfile("live-fff", "FROM y\n")
|
|
bottle_state.write_per_bottle_dockerfile("kept-ggg", "FROM z\n")
|
|
bottle_state.mark_preserved("kept-ggg")
|
|
|
|
result = _list_orphan_state_dirs({"claude-bottle-live-fff"})
|
|
self.assertEqual(["orphan-eee"], result)
|
|
|
|
def test_sorted_output(self):
|
|
for name in ("zzz-1", "aaa-1", "mmm-1"):
|
|
bottle_state.write_per_bottle_dockerfile(name, "FROM x\n")
|
|
self.assertEqual(
|
|
["aaa-1", "mmm-1", "zzz-1"],
|
|
_list_orphan_state_dirs(set()),
|
|
)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|