Tomas Mirchev
6b7a48bb20
Independent re-audit surfaced 11 follow-ups across two layers of review
(my fresh-eyes read + a parallel agent pass). Bundled into a single
commit because changes are small and intertwined.
Symlink / state consistency:
- FileSystem.same_symlink now uses raw readlink() instead of resolve().
Aligns the three sites that ask "is this our link?" (_load_state,
_check_overwrite_safe, remove_symlink) on a single rule: exact-readlink
match. Following symlink chains would let externally-modified links
pass as ours and be silently overwritten.
- LinkedState.from_dict raises ConfigError on missing required fields
instead of .get(..., False) silent defaults. Matches InstalledState.
- LinkOp.source is now consistently None for remove_link ops; the
service derives expected_source from current.links. Removes the
asymmetry between in-state and orphan-broken removal ops.
- _apply_plan: rename shadowing local from link_target to spec.
Fail loud:
- _xdg() now treats XDG_CONFIG_HOME="" the same as unset. Previously
an empty env var produced Path("") and state files were written to
$PWD instead of ~/.local/state/flow.
- _resolve_target raises PlanConflict when a package contains a bare
_root entry (no path components) instead of silently dropping it.
- _strip_prefix raises FlowError when a declared install path does not
start with its section's expected prefix (e.g. etc/foo under install.bin).
Speculative abstraction removed (CLAUDE.md):
- core.template.substitute (the $VAR form) had no production callers --
deleted along with its tests; only the {{var}} form remains.
- SetupModule base class -- five subclasses, no shared behaviour, no
polymorphic call site. Deleted.
- Profile.arch -- parsed but never read. Deleted.
- PackagePlan.pm_command -- set but never read. Deleted (service
recomputes pm_install_command at the call site).
- FileSystem.ensure_dir(mode=...), .copy_file(sudo=...), .read_text(
default=...) -- no callers. Deleted along with their test.
- bootstrap _execute_action: the upfront `phase not in VALID_PHASES`
check duplicated the trailing exhaustive raise. Kept the trailing
raise as the single source of truth; phase set still documented in
VALID_PHASES.
Completion ctx threading:
- Removed _config()/_manifest() helpers that re-loaded from disk on
every completion call. _list_targets, _list_namespaces, _list_platforms,
_list_bootstrap_profiles, _list_manifest_packages now take ctx and
read from ctx.config / ctx.manifest.
Test coverage and e2e:
- e2e container test exercises a real `flow dotfiles link` (no dry-run)
and asserts the resulting symlinks point into the dotfiles dir;
reruns to verify idempotency.
- New tests: LinkedState corrupt-state ConfigError, LinkedState bad-version
ConfigError, bare-_root PlanConflict, service-level _root path routing
+ skip semantics.
- 11 stale test imports removed (pyflakes clean across src/ + tests/).
357 unit tests + 1 e2e (gated) all pass.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
70 lines
2.0 KiB
Python
70 lines
2.0 KiB
Python
"""Tests for dotfiles domain models."""
|
|
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
from flow.core.errors import ConfigError
|
|
from flow.domain.dotfiles.models import (
|
|
LinkOp,
|
|
LinkTarget,
|
|
LinkedState,
|
|
Package,
|
|
)
|
|
|
|
|
|
def test_link_op_str_create():
|
|
op = LinkOp(type="create_link", target=Path("/home/x/.zshrc"),
|
|
source=Path("/dots/zsh/.zshrc"), package="_shared/zsh", needs_sudo=False)
|
|
assert "LINK:" in str(op)
|
|
assert ".zshrc" in str(op)
|
|
|
|
|
|
def test_link_op_str_sudo():
|
|
op = LinkOp(type="create_link", target=Path("/etc/hosts"),
|
|
source=Path("/dots/dns/hosts"), package="_shared/dns", needs_sudo=True)
|
|
assert "(sudo)" in str(op)
|
|
|
|
|
|
def test_linked_state_roundtrip():
|
|
lt = LinkTarget(source=Path("/a"), target=Path("/b"), package="p", from_module=False, needs_sudo=False)
|
|
state = LinkedState(links={Path("/b"): lt})
|
|
data = state.as_dict()
|
|
restored = LinkedState.from_dict(data)
|
|
assert Path("/b") in restored.links
|
|
assert restored.links[Path("/b")].source == Path("/a")
|
|
assert restored.links[Path("/b")].package == "p"
|
|
|
|
|
|
def test_linked_state_empty():
|
|
state = LinkedState.from_dict({})
|
|
assert state.links == {}
|
|
|
|
|
|
def test_package_has_id():
|
|
pkg = Package(name="zsh", layer="_shared", package_id="_shared/zsh",
|
|
source_dir=Path("/dots/_shared/zsh"), module=None, local_files=())
|
|
assert pkg.package_id == "_shared/zsh"
|
|
|
|
|
|
def test_linked_state_corrupt_missing_field_raises():
|
|
data = {
|
|
"version": 2,
|
|
"links": {
|
|
"_shared/zsh": {
|
|
"/home/u/.zshrc": {
|
|
# missing "from_module"
|
|
"source": "/dots/_shared/zsh/.zshrc",
|
|
"needs_sudo": False,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
with pytest.raises(ConfigError, match="from_module"):
|
|
LinkedState.from_dict(data)
|
|
|
|
|
|
def test_linked_state_unsupported_version_raises():
|
|
with pytest.raises(ConfigError, match="version 1"):
|
|
LinkedState.from_dict({"version": 1, "links": {}})
|