# Conflicts: # apps/desktop/e2e/archived-hidden-session-recoverable.spec.ts # apps/desktop/e2e/bot-chat-message-agent-friendly-name.spec.ts # apps/desktop/e2e/bot-mailbox-unreadable-ticket.spec.ts # apps/desktop/e2e/bot-mode-roster-localized.spec.ts # apps/desktop/e2e/bot-mode-row-click-mirrors-registry.spec.ts # apps/desktop/e2e/bot-mode-tab-shows-bot-name.spec.ts # apps/desktop/e2e/bot-roster-group-row-organisation.spec.ts # apps/desktop/e2e/bot-roster-ignores-infra-dirs.spec.ts # apps/desktop/e2e/bot-roster-timestamp-meta.spec.ts # apps/desktop/e2e/bot-roster-user-sections.spec.ts # apps/desktop/e2e/bot-routines-pane-narrow.spec.ts # apps/desktop/e2e/bot-row-open-recent-session.spec.ts # apps/desktop/e2e/bot-tile-ignores-ambient-composer-model.spec.ts # apps/desktop/e2e/group-composer-auto-grow.spec.ts # apps/desktop/e2e/group-create-gate-remote-roster.spec.ts # apps/desktop/e2e/group-prompt-renamed-primary-handle.spec.ts # apps/desktop/e2e/hosted-room-backend-continuity.spec.ts # apps/desktop/e2e/hosted-room-legacy-store-migration.spec.ts # apps/desktop/e2e/settings-scope-chips-bot-title.spec.ts # apps/desktop/e2e/worktree-branch-status.spec.ts # apps/desktop/electron/backend-probes.test.ts # apps/desktop/electron/connection-apply.test.ts # apps/desktop/electron/desktop-electron-pin.test.ts # apps/desktop/electron/desktop-uninstall.test.ts # apps/desktop/electron/gateway-file-download-transport.test.ts # apps/desktop/electron/gateway-stop-before-update.test.ts # apps/desktop/electron/github-api-auth.test.ts # apps/desktop/electron/registry-primary-profile-scope.test.ts # apps/desktop/electron/update-api-check.test.ts # apps/desktop/electron/update-handoff-marker.test.ts # apps/desktop/electron/venv-blocker-scan.test.ts # apps/desktop/scripts/after-extract.test.mjs # apps/desktop/scripts/local-pack-publish.test.mjs # apps/desktop/scripts/tasks-scroll.test.mjs # apps/desktop/src/app/settings/model-settings.test.tsx # apps/desktop/src/app/updates-overlay.blockers.test.tsx # apps/desktop/src/components/desktop-install-overlay.test.tsx # apps/desktop/src/lib/update-copy.test.ts # scripts/ci/check_os_marker_fakes.py # tests-js/desktop-mac-usage-descriptions.test.ts # tests-js/node-engine-alignment.test.ts # tests/agent/lsp/test_install_and_lint_fixes.py # tests/agent/test_command_token_source.py # tests/agent/test_compression_boundary_hook.py # tests/agent/test_create_openai_client_ssl_verify.py # tests/agent/test_custom_provider_ca_probes.py # tests/agent/test_endpoint_blackhole.py # tests/agent/test_estimator_parity.py # tests/agent/test_in_place_compaction.py # tests/agent/test_moa_loop_mode.py # tests/agent/test_model_metadata.py # tests/agent/test_skill_session_platform_gate.py # tests/agent/test_skill_utils.py # tests/agent/test_ssl_ca_guard.py # tests/computer_use/test_doctor.py # tests/cron/test_codex_execution_paths.py # tests/cron/test_cron_bot_chat_delivery.py # tests/cron/test_cron_script.py # tests/cron/test_media_delivery_parity.py # tests/cron/test_misfire_catchup.py # tests/cron/test_parallel_pool.py # tests/cron/test_recurring_eagain_redispatch.py # tests/gateway/test_choice_picker.py # tests/gateway/test_control_socket_windows_live.py # tests/gateway/test_dingtalk.py # tests/gateway/test_feishu.py # tests/gateway/test_feishu_onboard.py # tests/gateway/test_gateway_shutdown.py # tests/gateway/test_matrix.py # tests/gateway/test_model_command_custom_providers.py # tests/gateway/test_reasoning_command.py # tests/gateway/test_runtime_footer.py # tests/gateway/test_session.py # tests/gateway/test_session_hygiene.py # tests/gateway/test_status.py # tests/gateway/test_teams.py # tests/gateway/test_turn_lease.py # tests/gateway/test_whatsapp_connect.py # tests/hermes_cli/test_approvals_command.py # tests/hermes_cli/test_auth_store_lock_concurrent.py # tests/hermes_cli/test_backup.py # tests/hermes_cli/test_banner_git_state.py # tests/hermes_cli/test_certifi_repair.py # tests/hermes_cli/test_cmd_update.py # tests/hermes_cli/test_compat_manifest_targets.py # tests/hermes_cli/test_computer_use_cli.py # tests/hermes_cli/test_cpr_local_leak.py # tests/hermes_cli/test_dashboard_auth_gate.py # tests/hermes_cli/test_dashboard_procs_kill_grace.py # tests/hermes_cli/test_desktop_lifecycle_windows_live.py # tests/hermes_cli/test_doctor.py # tests/hermes_cli/test_doctor_command_install.py # tests/hermes_cli/test_fleet_config_migration_windows_live.py # tests/hermes_cli/test_gateway.py # tests/hermes_cli/test_gateway_platform_gating.py # tests/hermes_cli/test_gateway_restart_loop.py # tests/hermes_cli/test_gateway_task_probe.py # tests/hermes_cli/test_gateway_wsl.py # tests/hermes_cli/test_gui_command.py # tests/hermes_cli/test_install_cua_driver.py # tests/hermes_cli/test_kanban_db.py # tests/hermes_cli/test_lazy_command_exports.py # tests/hermes_cli/test_lazy_refresh_venv_repair.py # tests/hermes_cli/test_linux_desktop_entry.py # tests/hermes_cli/test_local_runtime.py # tests/hermes_cli/test_local_runtime_updates.py # tests/hermes_cli/test_managed_uv.py # tests/hermes_cli/test_mcp_reload_confirm_gate.py # tests/hermes_cli/test_nous_subscription.py # tests/hermes_cli/test_npm_engine.py # tests/hermes_cli/test_personality_none.py # tests/hermes_cli/test_pet_toggle.py # tests/hermes_cli/test_plan_reconciliation_windows_live.py # tests/hermes_cli/test_plugin_event_bus.py # tests/hermes_cli/test_plugin_manifest_v2.py # tests/hermes_cli/test_plugin_packs.py # tests/hermes_cli/test_plugins_cmd.py # tests/hermes_cli/test_plugins_cmd_enable_disable_nested.py # tests/hermes_cli/test_process_identity.py # tests/hermes_cli/test_profiles.py # tests/hermes_cli/test_profiles_sidebar_cache.py # tests/hermes_cli/test_pty_bridge.py # tests/hermes_cli/test_resolve_turn_limit.py # tests/hermes_cli/test_serve_runtime_inventory.py # tests/hermes_cli/test_session_vacuum_config.py # tests/hermes_cli/test_set_config_value.py # tests/hermes_cli/test_signal_handler_kanban_worker.py # tests/hermes_cli/test_slash_confirm_windows.py # tests/hermes_cli/test_stale_pid_guard.py # tests/hermes_cli/test_startup_fast_guards.py # tests/hermes_cli/test_status.py # tests/hermes_cli/test_telegram_managed_bot.py # tests/hermes_cli/test_tools_config.py # tests/hermes_cli/test_update_apply_shallow_count.py # tests/hermes_cli/test_update_autostash.py # tests/hermes_cli/test_update_concurrent_quarantine.py # tests/hermes_cli/test_update_fetch_failure_classifier.py # tests/hermes_cli/test_update_fleet_probe_resume_token.py # tests/hermes_cli/test_update_handoff_backend_reap.py # tests/hermes_cli/test_update_handoff_desktop_rebuild.py # tests/hermes_cli/test_update_head_moved_gate.py # tests/hermes_cli/test_update_host_obligation.py # tests/hermes_cli/test_update_import_guard.py # tests/hermes_cli/test_update_interrupted_recovery.py # tests/hermes_cli/test_update_inventory.py # tests/hermes_cli/test_update_launchd_unloaded_gateway.py # tests/hermes_cli/test_update_missing_configured_deps.py # tests/hermes_cli/test_update_modified_notice.py # tests/hermes_cli/test_update_multiplex_migration_hook.py # tests/hermes_cli/test_update_no_gateway_restart.py # tests/hermes_cli/test_update_orphan_backend_reap.py # tests/hermes_cli/test_update_parked_branch_guard.py # tests/hermes_cli/test_update_post_pull_syntax_guard.py # tests/hermes_cli/test_update_receipt.py # tests/hermes_cli/test_update_self_lock.py # tests/hermes_cli/test_update_shim_fail_closed.py # tests/hermes_cli/test_update_shim_self_lock.py # tests/hermes_cli/test_update_sqlite_remediation.py # tests/hermes_cli/test_update_stale_dashboard.py # tests/hermes_cli/test_update_stale_virtualenv.py # tests/hermes_cli/test_update_venv_health.py # tests/hermes_cli/test_update_venv_ownership_preflight.py # tests/hermes_cli/test_update_wedged_gateway.py # tests/hermes_cli/test_update_yes_flag.py # tests/hermes_cli/test_update_zip_two_phase.py # tests/hermes_cli/test_urllib_security.py # tests/hermes_cli/test_ux_messages_auth_config.py # tests/hermes_cli/test_ux_messages_startup.py # tests/hermes_cli/test_venv_holder_classifier.py # tests/hermes_cli/test_verify_console_scripts.py # tests/hermes_cli/test_verify_core_dependencies.py # tests/hermes_cli/test_web_server.py # tests/hermes_cli/test_web_server_console_ws.py # tests/hermes_cli/test_web_server_ws_ping.py # tests/hermes_cli/test_web_ui_build.py # tests/hermes_state/test_fts_rebuild_admission.py # tests/hermes_state/test_hermes_state.py # tests/plugins/memory/test_memory_lazy_install.py # tests/plugins/test_google_meet_plugin.py # tests/plugins/test_langfuse_plugin.py # tests/plugins/test_security_guidance_plugin.py # tests/plugins/test_transform_llm_output_hook.py # tests/scripts/desktop_update/test_desktop_update_windows_gateway_flag.py # tests/scripts/desktop_update/test_desktop_update_windows_python_handoff.py # tests/scripts/desktop_update/test_desktop_update_windows_timestamp.py # tests/scripts/install/test_install_clone_throttle_fallback.py # tests/scripts/install/test_install_lockfile_churn.py # tests/scripts/install/test_install_no_initial_commit.py # tests/scripts/install/test_install_sh_browser_install.py # tests/scripts/install/test_install_sh_node_prerelease.py # tests/scripts/install/test_install_sh_symlink_stomp.py # tests/scripts/install/test_install_sh_uv_lock_config.py # tests/scripts/install/test_install_unmerged_index.py # tests/scripts/test_contributor_map.py # tests/scripts/test_run_tests_parallel.py # tests/skills/test_competitor_news_monitor_skill.py # tests/skills/test_document_to_action_items_skill.py # tests/skills/test_google_workspace_setup.py # tests/skills/test_google_workspace_setup_deps.py # tests/skills/test_grounded_citations_skill.py # tests/skills/test_ip_as_logo_skill.py # tests/skills/test_live_dashboard_skill.py # tests/skills/test_mcp_oauth_remote_gateway_skill.py # tests/skills/test_office_document_skills.py # tests/skills/test_openclaw_migration.py # tests/skills/test_product_price_monitor_skill.py # tests/skills/test_scrollcraft_skill.py # tests/skills/test_setup_wizard_generator_skill.py # tests/skills/test_weekly_review_planning_skill.py # tests/test_engines_satisfiable.py # tests/test_fast_safe_load.py # tests/test_hermes_bootstrap.py # tests/test_hermes_constants.py # tests/test_hermes_logging.py # tests/test_managed_runtime_resolution.py # tests/test_model_tools_async_bridge.py # tests/test_packaging_build_guard.py # tests/test_packaging_metadata.py # tests/test_yaml_indent_consistency.py # tests/tools/test_approval_timeout_overflow.py # tests/tools/test_base_environment.py # tests/tools/test_bot_mode_dm.py # tests/tools/test_browser_chromium_check.py # tests/tools/test_browser_hardening.py # tests/tools/test_browser_homebrew_paths.py # tests/tools/test_browser_npx_warmup.py # tests/tools/test_browser_orphan_reaper.py # tests/tools/test_browser_real_profile.py # tests/tools/test_browser_use_cli.py # tests/tools/test_clipboard.py # tests/tools/test_code_execution.py # tests/tools/test_code_execution_modes.py # tests/tools/test_code_execution_windows_env.py # tests/tools/test_computer_use.py # tests/tools/test_delegate_liveness_timeout.py # tests/tools/test_execute_code_approval_cluster.py # tests/tools/test_execution_flag_detection.py # tests/tools/test_fal_common.py # tests/tools/test_file_operations.py # tests/tools/test_file_tools.py # tests/tools/test_file_tools_cwd_resolution.py # tests/tools/test_file_tools_live.py # tests/tools/test_lazy_deps.py # tests/tools/test_lazy_deps_durable_target.py # tests/tools/test_lazy_deps_managed.py # tests/tools/test_local_env_blocklist.py # tests/tools/test_local_tempdir.py # tests/tools/test_macos_protected_search.py # tests/tools/test_mcp_npx_cached_bin.py # tests/tools/test_oneshot_completion_linger.py # tests/tools/test_process_registry.py # tests/tools/test_read_file_schema_gating.py # tests/tools/test_skill_improvements.py # tests/tools/test_skills_sync.py # tests/tools/test_termux_api_detection.py # tests/tools/test_tirith_security.py # tests/tools/test_transcription_tools.py # tests/tools/test_tts_streaming.py # tests/tools/test_wake_word.py # tests/tui_gateway/test_compute_host_borrowed_lease.py # tests/tui_gateway/test_compute_host_turn_protocol.py # tests/tui_gateway/test_isolated_orphan_activity.py # tests/tui_gateway/test_protocol.py # tests/tui_gateway/test_slash_worker_profile_home.py # tests/tui_gateway/test_subprocess_encoding.py # tests/tui_gateway/test_tui_gateway_server.py # ui-tui/src/__tests__/terminalParity.test.ts # ui-tui/src/__tests__/termuxComposerLayout.test.ts # ui-tui/src/__tests__/textInputFastEcho.test.ts
327 lines
12 KiB
Python
327 lines
12 KiB
Python
"""ZIP fallback must not fire on dependency failures or clobber a dirty tree.
|
|
|
|
Issue #87304: on Windows the update ``try`` spans git pull *and* ``uv pip
|
|
install``. A locked ``hermes.exe`` makes the install exit 2, the handler
|
|
prints ``Git update failed``, and ``_update_via_zip`` replaces every
|
|
top-level entry except ``venv`` / ``node_modules`` / ``.git`` / ``.env`` —
|
|
permanently deleting uncommitted edits and untracked files. The git pull
|
|
has already succeeded by then, so the ZIP cannot fix the actual failure.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import shutil
|
|
import subprocess
|
|
from types import SimpleNamespace
|
|
from unittest.mock import patch
|
|
|
|
import pytest
|
|
|
|
from hermes_cli import main as hermes_main
|
|
import hermes_cli.main_install_repair as main_install_repair
|
|
from hermes_cli import update_cmd
|
|
|
|
|
|
def _cpe(cmd, returncode=2, stderr="", stdout="") -> subprocess.CalledProcessError:
|
|
exc = subprocess.CalledProcessError(returncode, cmd)
|
|
exc.stderr = stderr
|
|
exc.stdout = stdout
|
|
return exc
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Stage classification + ZIP gating
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_uv_pip_install_is_a_dependency_failure_not_git():
|
|
exc = _cpe([r"C:\venv\Scripts\uv.exe", "pip", "install", "-e", "."])
|
|
assert update_cmd._called_process_error_is_git(exc) is False
|
|
assert update_cmd._called_process_error_is_python_dep_install(exc) is True
|
|
assert update_cmd._format_update_failure_stage(exc) == (
|
|
"Python dependency install failed"
|
|
)
|
|
|
|
|
|
def test_venv_pip_install_is_a_dependency_failure():
|
|
exc = _cpe([r"C:\venv\Scripts\python.exe", "-m", "pip", "install", "-e", "."])
|
|
assert update_cmd._called_process_error_is_python_dep_install(exc) is True
|
|
assert update_cmd._called_process_error_is_git(exc) is False
|
|
|
|
|
|
def test_ensurepip_is_a_dependency_failure():
|
|
exc = _cpe([r"C:\venv\Scripts\python.exe", "-m", "ensurepip", "--upgrade"])
|
|
assert update_cmd._called_process_error_is_python_dep_install(exc) is True
|
|
assert update_cmd._format_update_failure_stage(exc) == (
|
|
"Python dependency install failed"
|
|
)
|
|
|
|
|
|
def test_git_pull_is_classified_as_git():
|
|
exc = _cpe(["git", "-c", "windows.appendAtomically=false", "pull"], returncode=1)
|
|
assert update_cmd._called_process_error_is_git(exc) is True
|
|
assert update_cmd._called_process_error_is_python_dep_install(exc) is False
|
|
assert update_cmd._format_update_failure_stage(exc) == "Git update failed"
|
|
|
|
|
|
def test_git_exe_path_is_still_git():
|
|
exc = _cpe([r"C:\Program Files\Git\cmd\git.exe", "fetch", "origin", "main"])
|
|
assert update_cmd._called_process_error_is_git(exc) is True
|
|
|
|
|
|
def test_unknown_command_gets_generic_stage():
|
|
exc = _cpe(["npm", "install"], returncode=1)
|
|
assert update_cmd._format_update_failure_stage(exc) == "Update step failed"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_posix_git_failure_does_not_zip(monkeypatch):
|
|
monkeypatch.setattr(hermes_main, "_is_windows", lambda: False)
|
|
monkeypatch.setattr(main_install_repair, "_is_windows", lambda: False)
|
|
exc = _cpe(["git", "pull"], returncode=1)
|
|
assert update_cmd._should_zip_fallback_on_update_error(exc) is False
|
|
|
|
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Dirty-tree overlay guard
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def _porcelain_run(stdout: str, returncode: int = 0):
|
|
def fake_run(cmd, **kwargs):
|
|
joined = " ".join(str(c) for c in cmd)
|
|
if "status" in joined and "--porcelain" in joined:
|
|
return subprocess.CompletedProcess(cmd, returncode, stdout=stdout, stderr="")
|
|
if "ls-tree" in joined: # tracked root entries = what the ZIP ships
|
|
return subprocess.CompletedProcess(cmd, 0, stdout="hermes_cli\nscratch\n", stderr="")
|
|
return subprocess.CompletedProcess(cmd, 0, stdout="", stderr="")
|
|
|
|
return fake_run
|
|
|
|
|
|
def test_zip_overlay_allowed_without_git(tmp_path):
|
|
assert update_cmd._zip_overlay_block_reason(tmp_path) is None
|
|
|
|
|
|
def test_zip_overlay_blocked_on_modified_file(tmp_path, monkeypatch):
|
|
(tmp_path / ".git").mkdir()
|
|
monkeypatch.setattr(
|
|
update_cmd.subprocess, "run", _porcelain_run(" M hermes_cli/update_cmd.py\n")
|
|
)
|
|
reason = update_cmd._zip_overlay_block_reason(tmp_path)
|
|
assert reason is not None
|
|
assert "uncommitted" in reason
|
|
|
|
|
|
def test_zip_overlay_blocked_on_untracked_file(tmp_path, monkeypatch):
|
|
(tmp_path / ".git").mkdir()
|
|
monkeypatch.setattr(update_cmd.subprocess, "run", _porcelain_run("?? notes.md\n"))
|
|
reason = update_cmd._zip_overlay_block_reason(tmp_path)
|
|
assert reason is not None
|
|
assert "untracked" in reason
|
|
|
|
|
|
def test_zip_overlay_blocked_when_git_status_fails(tmp_path, monkeypatch):
|
|
(tmp_path / ".git").mkdir()
|
|
monkeypatch.setattr(
|
|
update_cmd.subprocess,
|
|
"run",
|
|
_porcelain_run("", returncode=128),
|
|
)
|
|
reason = update_cmd._zip_overlay_block_reason(tmp_path)
|
|
assert reason is not None
|
|
assert "could not check" in reason
|
|
|
|
|
|
def test_zip_overlay_allowed_on_clean_git_checkout(tmp_path, monkeypatch):
|
|
(tmp_path / ".git").mkdir()
|
|
monkeypatch.setattr(update_cmd.subprocess, "run", _porcelain_run(""))
|
|
assert update_cmd._zip_overlay_block_reason(tmp_path) is None
|
|
|
|
|
|
def test_update_via_zip_aborts_before_download_when_dirty(
|
|
tmp_path, monkeypatch, capsys
|
|
):
|
|
"""The live tree must not be touched, and the ZIP must not be fetched."""
|
|
fake_root = tmp_path / "install"
|
|
fake_root.mkdir()
|
|
(fake_root / ".git").mkdir()
|
|
local = fake_root / "keep-me.txt"
|
|
local.write_text("local work\n", encoding="utf-8")
|
|
untracked_dir = fake_root / "agent" / "scratch"
|
|
untracked_dir.mkdir(parents=True)
|
|
(untracked_dir / "wip.py").write_text("print('wip')\n", encoding="utf-8")
|
|
|
|
monkeypatch.setattr(hermes_main, "PROJECT_ROOT", fake_root)
|
|
monkeypatch.setattr(
|
|
update_cmd.subprocess,
|
|
"run",
|
|
_porcelain_run(" M keep-me.txt\n?? agent/scratch/wip.py\n"),
|
|
)
|
|
|
|
with patch("urllib.request.urlretrieve") as download:
|
|
with pytest.raises(SystemExit) as exc_info:
|
|
update_cmd._update_via_zip(SimpleNamespace(branch=None))
|
|
|
|
assert exc_info.value.code == 1
|
|
download.assert_not_called()
|
|
assert local.read_text(encoding="utf-8") == "local work\n"
|
|
assert (untracked_dir / "wip.py").read_text(encoding="utf-8") == "print('wip')\n"
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Pre-swap TOCTOU re-check
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_status_uses_untracked_files_all(tmp_path, monkeypatch):
|
|
"""A user git config hiding untracked files must not blind the guard."""
|
|
(tmp_path / ".git").mkdir()
|
|
seen = []
|
|
|
|
def fake_run(cmd, **kwargs):
|
|
seen.append(cmd)
|
|
return subprocess.CompletedProcess(cmd, 0, stdout="", stderr="")
|
|
|
|
monkeypatch.setattr(update_cmd.subprocess, "run", fake_run)
|
|
update_cmd._zip_overlay_block_reason(tmp_path)
|
|
assert seen and "--untracked-files=all" in seen[0]
|
|
|
|
|
|
def test_staging_artifact_lines_are_recognized():
|
|
is_artifact = update_cmd._is_zip_staging_artifact_status_line
|
|
assert is_artifact("?? agent.hermes-update-staging/")
|
|
assert is_artifact("?? cli.py.hermes-update-staging")
|
|
assert is_artifact("?? tools.hermes-update-old/")
|
|
# Nested user files under a staging-lookalike directory don't match the
|
|
# top-level test only when the TOP level itself is not an artifact.
|
|
assert not is_artifact("?? agent/scratch/wip.py")
|
|
assert not is_artifact(" M hermes_cli/update_cmd.py")
|
|
assert not is_artifact("?? notes.hermes-update-staging.txt")
|
|
|
|
|
|
def test_recheck_ignores_own_staging_artifacts(tmp_path, monkeypatch):
|
|
(tmp_path / ".git").mkdir()
|
|
monkeypatch.setattr(
|
|
update_cmd.subprocess,
|
|
"run",
|
|
_porcelain_run("?? agent.hermes-update-staging/\n?? cli.py.hermes-update-old\n"),
|
|
)
|
|
assert (
|
|
update_cmd._zip_overlay_block_reason(tmp_path, ignore_staging_artifacts=True)
|
|
is None
|
|
)
|
|
# Without the flag the same output still refuses (pre-download check).
|
|
assert update_cmd._zip_overlay_block_reason(tmp_path) is not None
|
|
|
|
|
|
def test_recheck_still_blocks_user_files_amid_staging_artifacts(tmp_path, monkeypatch):
|
|
(tmp_path / ".git").mkdir()
|
|
monkeypatch.setattr(
|
|
update_cmd.subprocess,
|
|
"run",
|
|
_porcelain_run("?? agent.hermes-update-staging/\n?? my-notes.md\n"),
|
|
)
|
|
reason = update_cmd._zip_overlay_block_reason(
|
|
tmp_path, ignore_staging_artifacts=True
|
|
)
|
|
assert reason is not None
|
|
|
|
|
|
def test_zip_overlay_blocked_on_ignored_user_file(tmp_path, monkeypatch):
|
|
"""#87392 follow-up: a gitignored file outside the preserved entries is
|
|
still user data the overlay would delete — it must block."""
|
|
(tmp_path / ".git").mkdir()
|
|
monkeypatch.setattr(
|
|
update_cmd.subprocess, "run", _porcelain_run("!! scratch/notes.local\n")
|
|
)
|
|
reason = update_cmd._zip_overlay_block_reason(tmp_path)
|
|
assert reason is not None
|
|
assert "uncommitted" in reason or "untracked" in reason
|
|
|
|
|
|
def test_zip_overlay_flag_is_valid_against_real_git(tmp_path):
|
|
"""The ignored-mode flag must be one real git accepts — run REAL git.
|
|
|
|
Review of the first draft caught ``--ignored=all`` (not a valid mode:
|
|
git exits 128 'Invalid ignored mode'), which the mocked siblings could
|
|
not see; with an invalid flag every ZIP update would be refused as
|
|
'could not check the working tree'. This test creates a real repo with
|
|
a real .gitignore and asserts the guard both runs clean AND still sees
|
|
ignored user files.
|
|
"""
|
|
subprocess.run(["git", "init", "-q", str(tmp_path)], check=True)
|
|
(tmp_path / ".gitignore").write_text("*.local\nvenv/\n.venv/\n", encoding="utf-8")
|
|
subprocess.run(
|
|
["git", "-C", str(tmp_path), "add", ".gitignore"], check=True
|
|
)
|
|
subprocess.run(
|
|
[
|
|
"git", "-C", str(tmp_path),
|
|
"-c", "user.email=t@t", "-c", "user.name=t",
|
|
"commit", "-qm", "init",
|
|
],
|
|
check=True,
|
|
)
|
|
# Clean tree: guard must pass (flag valid, no false refusal).
|
|
assert update_cmd._zip_overlay_block_reason(tmp_path) is None
|
|
# Ignored user file under a shipped (tracked) dir: the swap would delete it, guard must block.
|
|
(tmp_path / "pkg").mkdir()
|
|
(tmp_path / "pkg" / "data.local").write_text("x", encoding="utf-8")
|
|
reason = update_cmd._zip_overlay_block_reason(tmp_path, shipped={"pkg"})
|
|
assert reason is not None
|
|
# Ignored preserved entry: still no refusal.
|
|
shutil.rmtree(tmp_path / "pkg")
|
|
(tmp_path / "venv").mkdir()
|
|
(tmp_path / "venv" / "lib.py").write_text("x", encoding="utf-8")
|
|
assert update_cmd._zip_overlay_block_reason(tmp_path) is None
|
|
# uv-default ``.venv`` is a supported layout (#112958): the ignored dir is the live runtime,
|
|
# not user data the overlay would destroy — refusing here made ZIP fallback impossible.
|
|
(tmp_path / ".venv").mkdir()
|
|
(tmp_path / ".venv" / "lib.py").write_text("x", encoding="utf-8")
|
|
status = subprocess.run(
|
|
["git", "-C", str(tmp_path), "status", "--porcelain", "--untracked-files=all", "--ignored=matching"],
|
|
capture_output=True, text=True,
|
|
).stdout
|
|
assert update_cmd._zip_overlay_block_reason(tmp_path) is None, status
|
|
|
|
|
|
|
|
|
|
def test_preserved_filter_does_not_split_non_rename_lines():
|
|
"""A plain ignored FILE literally named 'venv -> node_modules' is ONE
|
|
path (porcelain v1 doesn't quote spaces) — splitting it would filter it
|
|
as two preserved tops and fail-open into the destructive swap."""
|
|
assert not update_cmd._is_zip_preserved_entry_status_line(
|
|
"!! venv -> node_modules"
|
|
)
|
|
assert not update_cmd._is_zip_preserved_entry_status_line(
|
|
"?? venv -> node_modules"
|
|
)
|
|
# Real rename crossing out of a preserved dir still blocks…
|
|
assert not update_cmd._is_zip_preserved_entry_status_line(
|
|
"R venv/x -> src/x"
|
|
)
|
|
# …and a rename fully inside preserved entries is still filtered.
|
|
assert update_cmd._is_zip_preserved_entry_status_line(
|
|
"R venv/a -> node_modules/b"
|
|
)
|
|
|
|
|
|
def test_zip_overlay_allows_ignored_preserved_entries(tmp_path, monkeypatch):
|
|
"""venv/node_modules are gitignored on every normal install and the swap
|
|
preserves them — the ignored probe must not turn them into a false
|
|
refusal."""
|
|
(tmp_path / ".git").mkdir()
|
|
monkeypatch.setattr(
|
|
update_cmd.subprocess,
|
|
"run",
|
|
_porcelain_run("!! venv/\n!! node_modules/\n!! .env\n"),
|
|
)
|
|
assert update_cmd._zip_overlay_block_reason(tmp_path) is None
|