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>
99 lines
3.3 KiB
Python
99 lines
3.3 KiB
Python
"""End-to-end test for `flow dotfiles` against the example repo.
|
|
|
|
Gated by FLOW_RUN_E2E=1 because it builds and runs a container image.
|
|
Tries podman first, falls back to docker. Skips if neither is available.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import shutil
|
|
import subprocess
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
|
|
REPO_ROOT = Path(__file__).resolve().parents[2]
|
|
CONTAINERFILE = Path(__file__).parent / "Containerfile"
|
|
EXAMPLE_REPO = REPO_ROOT / "example" / "dotfiles-repo"
|
|
IMAGE_TAG = "flow-e2e:test"
|
|
|
|
|
|
def _pick_runtime() -> str | None:
|
|
for binary in ("podman", "docker"):
|
|
if shutil.which(binary):
|
|
return binary
|
|
return None
|
|
|
|
|
|
@pytest.mark.skipif(
|
|
os.environ.get("FLOW_RUN_E2E") != "1",
|
|
reason="set FLOW_RUN_E2E=1 to run",
|
|
)
|
|
def test_dotfiles_init_and_link_in_container():
|
|
runtime = _pick_runtime()
|
|
if runtime is None:
|
|
pytest.skip("neither podman nor docker is available")
|
|
|
|
build = subprocess.run(
|
|
[
|
|
runtime, "build",
|
|
"-f", str(CONTAINERFILE),
|
|
"-t", IMAGE_TAG,
|
|
str(REPO_ROOT),
|
|
],
|
|
capture_output=True,
|
|
text=True,
|
|
)
|
|
if build.returncode != 0:
|
|
pytest.fail(f"image build failed:\n{build.stdout}\n{build.stderr}")
|
|
|
|
try:
|
|
# Run flow inside the container against the mounted example repo.
|
|
# `flow dotfiles init` clones, so we need a real git remote — turn
|
|
# the read-only example mount into a bare-ish working repo first.
|
|
# --skip system avoids the _root/ paths which would try to sudo-link
|
|
# over /etc/hostname; we already cover the link path on non-system
|
|
# packages.
|
|
script = (
|
|
"set -eux; "
|
|
"cp -r /example /home/flowuser/dotfiles-src; "
|
|
"cd /home/flowuser/dotfiles-src; "
|
|
"git init -q -b main; "
|
|
"git -c user.email=e2e@example.com -c user.name=e2e add -A; "
|
|
"git -c user.email=e2e@example.com -c user.name=e2e commit -q -m initial; "
|
|
"cd /home/flowuser; "
|
|
"flow dotfiles init --repo /home/flowuser/dotfiles-src; "
|
|
"flow dotfiles link --profile linux-auto --skip system; "
|
|
# Verify real symlinks were created and point into the dotfiles dir.
|
|
"test -L /home/flowuser/.zshrc; "
|
|
"test -L /home/flowuser/.gitconfig; "
|
|
"readlink /home/flowuser/.zshrc | grep -q '/dotfiles/_shared/zsh/.zshrc'; "
|
|
"readlink /home/flowuser/.gitconfig | grep -q '/dotfiles/_shared/git/.gitconfig'; "
|
|
# Idempotency: rerun should be a no-op.
|
|
"flow dotfiles link --profile linux-auto --skip system; "
|
|
"flow dotfiles status"
|
|
)
|
|
result = subprocess.run(
|
|
[
|
|
runtime, "run", "--rm",
|
|
"-v", f"{EXAMPLE_REPO}:/example:ro",
|
|
IMAGE_TAG,
|
|
"-c", script,
|
|
],
|
|
capture_output=True,
|
|
text=True,
|
|
)
|
|
assert result.returncode == 0, (
|
|
f"e2e run failed (rc={result.returncode}):\n"
|
|
f"stdout: {result.stdout}\n"
|
|
f"stderr: {result.stderr}"
|
|
)
|
|
finally:
|
|
subprocess.run(
|
|
[runtime, "rmi", "-f", IMAGE_TAG],
|
|
capture_output=True,
|
|
text=True,
|
|
)
|