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>
112 lines
3.4 KiB
Python
112 lines
3.4 KiB
Python
"""Tests for flow.core.yaml."""
|
|
|
|
import pytest
|
|
|
|
from flow.core.errors import ConfigError
|
|
from flow.core.yaml import (
|
|
list_yaml_files,
|
|
load_yaml_documents,
|
|
load_yaml_file,
|
|
load_yaml_source,
|
|
load_yaml_sources,
|
|
merge_yaml_values,
|
|
)
|
|
|
|
|
|
class TestLoadYamlFile:
|
|
def test_loads_mapping(self, tmp_path):
|
|
f = tmp_path / "a.yaml"
|
|
f.write_text("key: value\n")
|
|
assert load_yaml_file(f) == {"key": "value"}
|
|
|
|
def test_empty_file_returns_empty_dict(self, tmp_path):
|
|
f = tmp_path / "empty.yaml"
|
|
f.write_text("")
|
|
assert load_yaml_file(f) == {}
|
|
|
|
def test_non_mapping_raises(self, tmp_path):
|
|
f = tmp_path / "list.yaml"
|
|
f.write_text("- one\n- two\n")
|
|
with pytest.raises(ConfigError, match="mapping at root"):
|
|
load_yaml_file(f)
|
|
|
|
def test_invalid_yaml_raises(self, tmp_path):
|
|
f = tmp_path / "bad.yaml"
|
|
f.write_text(":\n :\n [invalid")
|
|
with pytest.raises(ConfigError, match="Invalid YAML"):
|
|
load_yaml_file(f)
|
|
|
|
|
|
class TestMergeYamlValues:
|
|
def test_dict_merge(self):
|
|
base = {"a": 1, "b": {"x": 10}}
|
|
overlay = {"b": {"y": 20}, "c": 3}
|
|
result = merge_yaml_values(base, overlay)
|
|
assert result == {"a": 1, "b": {"x": 10, "y": 20}, "c": 3}
|
|
|
|
def test_list_concat(self):
|
|
assert merge_yaml_values([1, 2], [3, 4]) == [1, 2, 3, 4]
|
|
|
|
def test_scalar_override(self):
|
|
assert merge_yaml_values("old", "new") == "new"
|
|
|
|
def test_overlay_wins_type_mismatch(self):
|
|
assert merge_yaml_values({"a": 1}, "scalar") == "scalar"
|
|
|
|
|
|
class TestListYamlFiles:
|
|
def test_lists_sorted(self, tmp_path):
|
|
(tmp_path / "b.yaml").write_text("b: 1\n")
|
|
(tmp_path / "a.yml").write_text("a: 1\n")
|
|
(tmp_path / "c.txt").write_text("ignored")
|
|
files = list_yaml_files(tmp_path)
|
|
assert [f.name for f in files] == ["a.yml", "b.yaml"]
|
|
|
|
def test_missing_dir_returns_empty(self, tmp_path):
|
|
assert list_yaml_files(tmp_path / "nope") == []
|
|
|
|
|
|
class TestLoadYamlSource:
|
|
def test_file(self, tmp_path):
|
|
f = tmp_path / "config.yaml"
|
|
f.write_text("key: val\n")
|
|
assert load_yaml_source(f) == {"key": "val"}
|
|
|
|
def test_directory_merges(self, tmp_path):
|
|
(tmp_path / "01.yaml").write_text("a: 1\n")
|
|
(tmp_path / "02.yaml").write_text("b: 2\n")
|
|
result = load_yaml_source(tmp_path)
|
|
assert result == {"a": 1, "b": 2}
|
|
|
|
def test_missing_returns_empty(self, tmp_path):
|
|
assert load_yaml_source(tmp_path / "gone") == {}
|
|
|
|
|
|
class TestLoadYamlDocuments:
|
|
def test_single_file(self, tmp_path):
|
|
f = tmp_path / "doc.yaml"
|
|
f.write_text("x: 1\n")
|
|
docs = load_yaml_documents(f)
|
|
assert docs == [{"x": 1}]
|
|
|
|
def test_directory(self, tmp_path):
|
|
(tmp_path / "a.yaml").write_text("a: 1\n")
|
|
(tmp_path / "b.yaml").write_text("b: 2\n")
|
|
docs = load_yaml_documents(tmp_path)
|
|
assert docs == [{"a": 1}, {"b": 2}]
|
|
|
|
def test_missing_returns_empty(self, tmp_path):
|
|
assert load_yaml_documents(tmp_path / "gone") == []
|
|
|
|
|
|
class TestLoadYamlSources:
|
|
def test_merges_multiple_paths(self, tmp_path):
|
|
d1 = tmp_path / "d1"
|
|
d2 = tmp_path / "d2"
|
|
d1.mkdir()
|
|
d2.mkdir()
|
|
(d1 / "a.yaml").write_text("a: 1\n")
|
|
(d2 / "b.yaml").write_text("b: 2\n")
|
|
result = load_yaml_sources(d1, d2)
|
|
assert result == {"a": 1, "b": 2}
|