7d2b3b767d
Merge upstream b1f003e186 while preserving PM runtime ownership and
Python 3.14 worker startup, Windows signing, and macOS wait recovery.
Keep retired runtime modules deleted. Port upstream updater preflight
checks into the checkout strategy and preserve live build logging.
Carry checkpoint filename handling and process recovery into the current
module layout. Regenerate locks and adapt incoming platform test markers.
Focused Python and JavaScript tests, desktop and root-test typechecks,
conflict-path lint checks, lock validation, and retired-import checks pass.
The full test suite and packaged release builds were not run.
80 lines
3.0 KiB
Python
80 lines
3.0 KiB
Python
"""Checkpoint file names must survive Git's machine-readable path output."""
|
|
|
|
import os
|
|
|
|
import pytest
|
|
|
|
from tools import checkpoint_manager as checkpoints
|
|
|
|
|
|
def test_safe_restore_preserves_exact_paths_and_user_edits(tmp_path, monkeypatch):
|
|
_assert_safe_restore(tmp_path, monkeypatch, [" leading.txt", "报告.txt", "ordinary.txt"])
|
|
|
|
|
|
@pytest.mark.platforms("linux")
|
|
def test_safe_restore_preserves_posix_byte_paths(tmp_path, monkeypatch):
|
|
_assert_safe_restore(tmp_path, monkeypatch, [b" raw-\xff.txt", b"carriage\rreturn.txt", b"crlf\r\nname.txt"])
|
|
|
|
|
|
def _assert_safe_restore(tmp_path, monkeypatch, names):
|
|
names = [os.fsdecode(name) for name in names]
|
|
monkeypatch.setattr(checkpoints, "CHECKPOINT_BASE", tmp_path / "checkpoints")
|
|
work = tmp_path / "project"
|
|
work.mkdir()
|
|
(work / "AGENTS.md").write_text("Project instructions\n", encoding="utf-8")
|
|
|
|
for name in names:
|
|
(work / name).write_text("original\n", encoding="utf-8")
|
|
preserved = work / " 用户修改.txt"
|
|
preserved.write_text("original\n", encoding="utf-8")
|
|
manager = checkpoints.CheckpointManager(enabled=True)
|
|
assert manager.ensure_checkpoint(str(work))
|
|
target = manager.list_checkpoints(str(work))[0]["hash"]
|
|
|
|
for name in names:
|
|
(work / name).write_text("agent edit\n", encoding="utf-8")
|
|
manager.record_agent_write(str(work / name))
|
|
preserved.write_text("agent edit\n", encoding="utf-8")
|
|
manager.record_agent_write(str(preserved))
|
|
preserved.write_text("user edit\n", encoding="utf-8")
|
|
|
|
result = manager.restore(str(work), target, safe=True)
|
|
|
|
assert result["success"]
|
|
assert set(result["restored_files"]) == set(names)
|
|
assert result["skipped_user_edits"] == [preserved.name]
|
|
assert all((work / name).read_text(encoding="utf-8") == "original\n" for name in names)
|
|
assert preserved.read_text(encoding="utf-8") == "user edit\n"
|
|
|
|
|
|
def test_size_cap_applies_to_leading_space_paths(tmp_path, monkeypatch):
|
|
_assert_size_cap(tmp_path, monkeypatch, " oversized.bin")
|
|
|
|
|
|
@pytest.mark.platforms("linux")
|
|
def test_size_cap_applies_to_posix_byte_paths(tmp_path, monkeypatch):
|
|
_assert_size_cap(tmp_path, monkeypatch, b" oversized-\xff.bin")
|
|
|
|
|
|
def _assert_size_cap(tmp_path, monkeypatch, name):
|
|
name = os.fsdecode(name)
|
|
monkeypatch.setattr(checkpoints, "CHECKPOINT_BASE", tmp_path / "checkpoints")
|
|
work = tmp_path / "project"
|
|
work.mkdir()
|
|
(work / "small.txt").write_text("keep\n", encoding="utf-8")
|
|
|
|
(work / name).write_bytes(b"x" * (1024 * 1024 + 1))
|
|
manager = checkpoints.CheckpointManager(enabled=True, max_file_size_mb=1)
|
|
assert manager.ensure_checkpoint(str(work))
|
|
target = manager.list_checkpoints(str(work))[0]["hash"]
|
|
store = checkpoints._store_path()
|
|
|
|
included, _, _ = checkpoints._run_git(
|
|
["cat-file", "-e", f"{target}:small.txt"], store, str(work)
|
|
)
|
|
oversized_included, _, _ = checkpoints._run_git(
|
|
["cat-file", "-e", f"{target}:{name}"], store, str(work), allowed_returncodes={128}
|
|
)
|
|
assert included
|
|
assert not oversized_included
|