gabriel / muse public
test_cmd_cherry_pick.py python
188 lines 7.6 KB
Raw
sha256:51ce277f663e01a43eaffbe77509b1de7ac2d4251b55d23306304bcdeb92c90d feat(pack): delta-encode snapshots in MPackBundle wire format Sonnet 4.6 minor ⚠ breaking 125 days ago
1 """Comprehensive tests for ``muse cherry-pick``.
2
3 Covers:
4 - E2E: cherry-pick a specific commit onto current branch
5 - Integration: commit is replayed, creates new commit
6 - Security: sanitized output for conflict paths
7 - Stress: cherry-pick many commits
8 """
9
10 from __future__ import annotations
11
12 import datetime
13 import json
14 import pathlib
15
16 import pytest
17 from tests.cli_test_helper import CliRunner
18 from muse.core.types import long_id, fake_id, blob_id
19 from muse.core.paths import heads_dir, ref_path, muse_dir
20
21 cli = None # argparse migration — CliRunner ignores this arg
22
23 runner = CliRunner()
24
25
26 # ---------------------------------------------------------------------------
27 # Shared helpers
28 # ---------------------------------------------------------------------------
29
30 def _env(root: pathlib.Path) -> Manifest:
31 return {"MUSE_REPO_ROOT": str(root)}
32
33
34 def _init_repo(tmp_path: pathlib.Path) -> tuple[pathlib.Path, str]:
35 dot_muse = muse_dir(tmp_path)
36 dot_muse.mkdir()
37 repo_id = fake_id("repo")
38 (dot_muse / "repo.json").write_text(json.dumps({
39 "repo_id": repo_id,
40 "domain": "code",
41 "default_branch": "main",
42 "created_at": "2025-01-01T00:00:00+00:00",
43 }), encoding="utf-8")
44 (dot_muse / "HEAD").write_text("ref: refs/heads/main", encoding="utf-8")
45 (dot_muse / "refs" / "heads").mkdir(parents=True)
46 (dot_muse / "snapshots").mkdir()
47 (dot_muse / "commits").mkdir()
48 (dot_muse / "objects").mkdir()
49 return tmp_path, repo_id
50
51
52 def _make_commit(root: pathlib.Path, repo_id: str, branch: str = "main",
53 message: str = "test",
54 manifest: Manifest | None = None) -> str:
55 from muse.core.store import CommitRecord, SnapshotRecord, write_commit, write_snapshot
56 from muse.core.snapshot import compute_snapshot_id, compute_commit_id
57
58 ref_file = ref_path(root, branch)
59 parent_id = ref_file.read_text().strip() if ref_file.exists() else None
60 m = manifest or {}
61 snap_id = compute_snapshot_id(m)
62 committed_at = datetime.datetime.now(datetime.timezone.utc)
63 commit_id = compute_commit_id( parent_ids=[parent_id] if parent_id else [],
64 snapshot_id=snap_id, message=message,
65 committed_at_iso=committed_at.isoformat(),
66 )
67 write_snapshot(root, SnapshotRecord(snapshot_id=snap_id, manifest=m))
68 write_commit(root, CommitRecord(
69 commit_id=commit_id, repo_id=repo_id, branch=branch,
70 snapshot_id=snap_id, message=message, committed_at=committed_at,
71 parent_commit_id=parent_id,
72 ))
73 ref_file.parent.mkdir(parents=True, exist_ok=True)
74 ref_file.write_text(commit_id, encoding="utf-8")
75 return commit_id
76
77
78 def _write_object(root: pathlib.Path, content: bytes) -> str:
79 from muse.core.object_store import write_object
80 oid = blob_id(content)
81 write_object(root, oid, content)
82 return oid
83
84
85 # ---------------------------------------------------------------------------
86 # Parser flag tests
87 # ---------------------------------------------------------------------------
88
89 class TestRegisterFlags:
90 def _parse(self, *args: str) -> "argparse.Namespace":
91 import argparse
92 from muse.cli.commands.cherry_pick import register
93 p = argparse.ArgumentParser()
94 sub = p.add_subparsers()
95 register(sub)
96 return p.parse_args(["cherry-pick", *args])
97
98 def test_default_json_out_is_false(self) -> None:
99 ns = self._parse("abc123")
100 assert ns.json_out is False
101
102 def test_json_flag_sets_json_out(self) -> None:
103 ns = self._parse("--json", "abc123")
104 assert ns.json_out is True
105
106 def test_j_shorthand_sets_json_out(self) -> None:
107 ns = self._parse("-j", "abc123")
108 assert ns.json_out is True
109
110
111 # ---------------------------------------------------------------------------
112 # Tests
113 # ---------------------------------------------------------------------------
114
115 class TestCherryPickCLI:
116 def test_cherry_pick_commit_from_another_branch(self, tmp_path: pathlib.Path) -> None:
117 root, repo_id = _init_repo(tmp_path)
118 base = _make_commit(root, repo_id, branch="main", message="base")
119 (heads_dir(root) / "feature").write_text(base)
120 obj = _write_object(root, b"feature content")
121 feature_commit = _make_commit(root, repo_id, branch="feature",
122 message="feature work",
123 manifest={"new.mid": obj})
124 result = runner.invoke(
125 cli, ["cherry-pick", feature_commit], env=_env(root), catch_exceptions=False
126 )
127 assert result.exit_code == 0
128
129 def test_cherry_pick_invalid_commit_fails(self, tmp_path: pathlib.Path) -> None:
130 root, repo_id = _init_repo(tmp_path)
131 _make_commit(root, repo_id)
132 result = runner.invoke(cli, ["cherry-pick", "deadbeef" * 8], env=_env(root))
133 assert result.exit_code != 0
134
135 def test_cherry_pick_creates_new_commit(self, tmp_path: pathlib.Path) -> None:
136 root, repo_id = _init_repo(tmp_path)
137 base = _make_commit(root, repo_id, branch="main", message="base")
138 (heads_dir(root) / "feature").write_text(base)
139 obj = _write_object(root, b"cherry content")
140 feature_commit = _make_commit(root, repo_id, branch="feature",
141 message="cherry", manifest={"c.mid": obj})
142 original_head = (heads_dir(root) / "main").read_text().strip()
143 runner.invoke(cli, ["cherry-pick", feature_commit], env=_env(root), catch_exceptions=False)
144 new_head = (heads_dir(root) / "main").read_text().strip()
145 assert new_head != original_head
146
147 def test_cherry_pick_format_json(self, tmp_path: pathlib.Path) -> None:
148 root, repo_id = _init_repo(tmp_path)
149 base = _make_commit(root, repo_id, branch="main", message="base")
150 (heads_dir(root) / "feature").write_text(base)
151 obj = _write_object(root, b"json pick")
152 feature_commit = _make_commit(root, repo_id, branch="feature",
153 message="json", manifest={"j.mid": obj})
154 result = runner.invoke(
155 cli, ["cherry-pick", "--json", feature_commit],
156 env=_env(root), catch_exceptions=False
157 )
158 assert result.exit_code == 0
159 data = json.loads(result.output)
160 assert isinstance(data, dict)
161
162 def test_cherry_pick_output_sanitized(self, tmp_path: pathlib.Path) -> None:
163 root, repo_id = _init_repo(tmp_path)
164 base = _make_commit(root, repo_id, branch="main", message="base")
165 (heads_dir(root) / "feature").write_text(base)
166 obj = _write_object(root, b"safe content")
167 feature_commit = _make_commit(root, repo_id, branch="feature",
168 message="safe", manifest={"s.mid": obj})
169 result = runner.invoke(cli, ["cherry-pick", feature_commit], env=_env(root), catch_exceptions=False)
170 assert "\x1b" not in result.output
171
172
173 class TestCherryPickStress:
174 def test_cherry_pick_sequence(self, tmp_path: pathlib.Path) -> None:
175 root, repo_id = _init_repo(tmp_path)
176 base = _make_commit(root, repo_id, branch="main", message="base")
177 (heads_dir(root) / "feature").write_text(base)
178 commits = []
179 for i in range(5):
180 obj = _write_object(root, f"content {i}".encode())
181 c = _make_commit(root, repo_id, branch="feature",
182 message=f"commit {i}", manifest={f"f{i}.mid": obj})
183 commits.append(c)
184 for commit_id in commits:
185 result = runner.invoke(
186 cli, ["cherry-pick", commit_id], env=_env(root), catch_exceptions=False
187 )
188 assert result.exit_code == 0
File History 1 commit
sha256:51ce277f663e01a43eaffbe77509b1de7ac2d4251b55d23306304bcdeb92c90d feat(pack): delta-encode snapshots in MPackBundle wire format Sonnet 4.6 minor ⚠ 125 days ago