# 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
330 lines
13 KiB
Python
330 lines
13 KiB
Python
"""Tests for the two-phase ZIP replace and the shared venv-layout helpers.
|
|
|
|
``_atomic_replace_dir`` (#49145) made each *individual* directory swap safe,
|
|
but the ZIP update replaced ~70 top-level entries in a loop with no atomicity
|
|
across iterations. An interruption partway left some entries at the new
|
|
version and the rest at the old one -- every file valid Python, the
|
|
combination unbootable. That is the mechanism behind the ``ImportError`` in
|
|
#76091 and the field report in #63717.
|
|
|
|
Reference: issues #76104 (ZIP atomicity) and #76105 (venv-helper duplication).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
from hermes_cli import update_cmd
|
|
from hermes_constants import venv_bin_dir, venv_python_path
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Two-phase replace
|
|
# ---------------------------------------------------------------------------
|
|
|
|
def _live_tree(root: Path, names: dict[str, str]) -> None:
|
|
for name, marker in names.items():
|
|
d = root / name
|
|
d.mkdir(parents=True, exist_ok=True)
|
|
(d / "version.txt").write_text(marker)
|
|
|
|
def _stage_all(root: Path, new: Path, names: list[str]) -> list[tuple[str, str]]:
|
|
return [
|
|
(
|
|
update_cmd._stage_replacement(str(new / n), str(root / n)),
|
|
str(root / n),
|
|
)
|
|
for n in names
|
|
]
|
|
|
|
def test_staging_touches_nothing_live(tmp_path):
|
|
"""Phase 1 must not modify the install -- a failure there is a no-op."""
|
|
live, new = tmp_path / "live", tmp_path / "new"
|
|
_live_tree(live, {"agent": "old", "tools": "old"})
|
|
_live_tree(new, {"agent": "new", "tools": "new"})
|
|
|
|
_stage_all(live, new, ["agent", "tools"])
|
|
|
|
assert (live / "agent" / "version.txt").read_text() == "old"
|
|
assert (live / "tools" / "version.txt").read_text() == "old"
|
|
|
|
def test_commit_swaps_every_entry(tmp_path):
|
|
live, new = tmp_path / "live", tmp_path / "new"
|
|
_live_tree(live, {"agent": "old", "tools": "old"})
|
|
_live_tree(new, {"agent": "new", "tools": "new"})
|
|
|
|
update_cmd._commit_staged_replacements(_stage_all(live, new, ["agent", "tools"]))
|
|
|
|
assert (live / "agent" / "version.txt").read_text() == "new"
|
|
assert (live / "tools" / "version.txt").read_text() == "new"
|
|
# No staging/backup litter left behind.
|
|
assert not [p for p in os.listdir(live) if "hermes-update" in p]
|
|
|
|
def test_failed_swap_rolls_back_every_earlier_swap(tmp_path, monkeypatch):
|
|
"""The regression: a mid-loop failure must not leave a mixed-version tree.
|
|
|
|
Before the two-phase split this produced `agent/` new + `tools/` stale --
|
|
the exact shape that yields
|
|
`ImportError: cannot import name 'TODO_INJECTION_HEADER'`.
|
|
"""
|
|
live, new = tmp_path / "live", tmp_path / "new"
|
|
_live_tree(live, {"agent": "old", "tools": "old"})
|
|
_live_tree(new, {"agent": "new", "tools": "new"})
|
|
staged = _stage_all(live, new, ["agent", "tools"])
|
|
|
|
real_rename = os.rename
|
|
calls = {"n": 0}
|
|
|
|
def flaky_rename(src, dst):
|
|
calls["n"] += 1
|
|
# Let the first entry swap fully (2 renames), then break the second.
|
|
if calls["n"] == 4:
|
|
raise OSError("simulated AV interference")
|
|
return real_rename(src, dst)
|
|
|
|
monkeypatch.setattr(update_cmd.os, "rename", flaky_rename)
|
|
|
|
with pytest.raises(OSError):
|
|
update_cmd._commit_staged_replacements(staged)
|
|
|
|
monkeypatch.undo()
|
|
# Both entries must be back at the OLD version -- not one new, one old.
|
|
versions = {
|
|
n: (live / n / "version.txt").read_text() for n in ("agent", "tools")
|
|
}
|
|
assert versions == {"agent": "old", "tools": "old"}, (
|
|
f"mixed-version tree after rollback: {versions}"
|
|
)
|
|
|
|
def test_commit_handles_entries_absent_from_the_install(tmp_path):
|
|
"""A brand-new top-level dir has no live counterpart to move aside."""
|
|
live, new = tmp_path / "live", tmp_path / "new"
|
|
live.mkdir()
|
|
_live_tree(new, {"brand_new": "new"})
|
|
|
|
update_cmd._commit_staged_replacements(_stage_all(live, new, ["brand_new"]))
|
|
|
|
assert (live / "brand_new" / "version.txt").read_text() == "new"
|
|
|
|
def test_staging_clears_leftovers_from_an_interrupted_run(tmp_path):
|
|
live, new = tmp_path / "live", tmp_path / "new"
|
|
_live_tree(live, {"agent": "old"})
|
|
_live_tree(new, {"agent": "new"})
|
|
stale = Path(f"{live / 'agent'}.hermes-update-staging")
|
|
stale.mkdir()
|
|
(stale / "junk.txt").write_text("from a previous crash")
|
|
|
|
update_cmd._commit_staged_replacements(_stage_all(live, new, ["agent"]))
|
|
|
|
assert (live / "agent" / "version.txt").read_text() == "new"
|
|
assert not (live / "agent" / "junk.txt").exists()
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Shared venv helpers (#76105)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
def test_venv_helpers_accept_str_and_path():
|
|
assert venv_python_path("/opt/x/venv") == venv_python_path(Path("/opt/x/venv"))
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Top-level FILES must be atomic too (#76104 review, C1)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
def test_top_level_files_are_swapped_atomically(tmp_path):
|
|
"""The repo root holds 20 first-party modules (run_agent.py, cli.py,
|
|
hermes_constants.py, ...). Covering only directories would leave exactly
|
|
the bug class this PR closes."""
|
|
live, new = tmp_path / "live", tmp_path / "new"
|
|
live.mkdir()
|
|
new.mkdir()
|
|
(live / "run_agent.py").write_text("old")
|
|
(new / "run_agent.py").write_text("new")
|
|
|
|
staged = [
|
|
(
|
|
update_cmd._stage_replacement(
|
|
str(new / "run_agent.py"), str(live / "run_agent.py")
|
|
),
|
|
str(live / "run_agent.py"),
|
|
)
|
|
]
|
|
update_cmd._commit_staged_replacements(staged)
|
|
|
|
assert (live / "run_agent.py").read_text() == "new"
|
|
assert not [p for p in os.listdir(live) if "hermes-update" in p]
|
|
|
|
def test_file_swap_failure_restores_the_original_file(tmp_path, monkeypatch):
|
|
"""A mid-swap failure must not leave a stale-or-corrupt root module."""
|
|
live, new = tmp_path / "live", tmp_path / "new"
|
|
live.mkdir()
|
|
new.mkdir()
|
|
for name in ("cli.py", "run_agent.py"):
|
|
(live / name).write_text("old")
|
|
(new / name).write_text("new")
|
|
|
|
staged = [
|
|
(update_cmd._stage_replacement(str(new / n), str(live / n)), str(live / n))
|
|
for n in ("cli.py", "run_agent.py")
|
|
]
|
|
|
|
real_rename = os.rename
|
|
calls = {"n": 0}
|
|
|
|
def flaky_rename(src, dst):
|
|
calls["n"] += 1
|
|
if calls["n"] == 4:
|
|
raise OSError("simulated AV interference")
|
|
return real_rename(src, dst)
|
|
|
|
monkeypatch.setattr(update_cmd.os, "rename", flaky_rename)
|
|
with pytest.raises(OSError):
|
|
update_cmd._commit_staged_replacements(staged)
|
|
monkeypatch.undo()
|
|
|
|
versions = {n: (live / n).read_text() for n in ("cli.py", "run_agent.py")}
|
|
assert versions == {"cli.py": "old", "run_agent.py": "old"}, (
|
|
f"mixed/corrupt root modules after rollback: {versions}"
|
|
)
|
|
|
|
def test_failed_staging_leaves_no_orphaned_copies(tmp_path, monkeypatch):
|
|
"""#76104 review C2: orphaned staging dirs make the retry we recommend
|
|
fail harder than the original attempt (less free space each time)."""
|
|
live, new = tmp_path / "live", tmp_path / "new"
|
|
_live_tree(live, {"agent": "old", "tools": "old", "gateway": "old"})
|
|
_live_tree(new, {"agent": "new", "tools": "new", "gateway": "new"})
|
|
|
|
real_copytree = update_cmd.shutil.copytree
|
|
calls = {"n": 0}
|
|
|
|
def flaky_copytree(src, dst, *a, **kw):
|
|
calls["n"] += 1
|
|
if calls["n"] == 3:
|
|
raise OSError(28, "No space left on device")
|
|
return real_copytree(src, dst, *a, **kw)
|
|
|
|
monkeypatch.setattr(update_cmd.shutil, "copytree", flaky_copytree)
|
|
|
|
staged: list[tuple[str, str]] = []
|
|
with pytest.raises(OSError):
|
|
try:
|
|
for n in ("agent", "tools", "gateway"):
|
|
staged.append(
|
|
(
|
|
update_cmd._stage_replacement(
|
|
str(new / n), str(live / n)
|
|
),
|
|
str(live / n),
|
|
)
|
|
)
|
|
except Exception:
|
|
update_cmd._discard_staged(staged)
|
|
raise
|
|
monkeypatch.undo()
|
|
|
|
leftovers = [p for p in os.listdir(live) if "hermes-update" in p]
|
|
assert leftovers == [], f"orphaned staging copies: {leftovers}"
|
|
# And nothing live was touched.
|
|
for n in ("agent", "tools", "gateway"):
|
|
assert (live / n / "version.txt").read_text() == "old"
|
|
|
|
def test_venv_helpers_honour_an_explicit_platform_verdict():
|
|
"""Callers must be able to override the platform check (#76107 CI).
|
|
|
|
The suite exercises Windows paths on Linux CI by patching predicates like
|
|
`hermes_main._is_windows`. A helper that reads `sys.platform`
|
|
unconditionally silently drops those paths out of coverage -- and broke
|
|
`test_verify_core_dependencies.py::test_uses_virtual_env_from_environment`,
|
|
which patches `_is_windows` and then asserts on a `Scripts/python.exe`
|
|
path.
|
|
"""
|
|
v = Path("/opt/proj/venv")
|
|
assert venv_bin_dir(v, windows=True).name == "Scripts"
|
|
assert venv_bin_dir(v, windows=False).name == "bin"
|
|
assert venv_python_path(v, windows=True).name == "python.exe"
|
|
assert venv_python_path(v, windows=False).name == "python"
|
|
# Halves must stay consistent under an explicit verdict.
|
|
for flag in (True, False):
|
|
assert venv_python_path(v, windows=flag).parent == venv_bin_dir(
|
|
v, windows=flag
|
|
)
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Crash between "move dst aside" and "move staging in" (Phase 2 review HIGH)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
def test_staging_restores_backup_when_dst_is_missing(tmp_path, monkeypatch):
|
|
"""A previous run that died mid-swap leaves dst missing and the backup as
|
|
the ONLY copy of that entry. On retry, _stage_replacement must restore
|
|
the backup to dst BEFORE clearing leftovers — otherwise a staging failure
|
|
right after (disk exhaustion is likeliest exactly then) leaves a hole in
|
|
the install with nothing to roll back to."""
|
|
live, new = tmp_path / "live", tmp_path / "new"
|
|
live.mkdir()
|
|
_live_tree(new, {"agent": "new"})
|
|
# Simulate the crashed state: dst gone, backup holds the old tree.
|
|
backup = live / "agent.hermes-update-old"
|
|
backup.mkdir()
|
|
(backup / "version.txt").write_text("old")
|
|
|
|
# Staging fails (disk full) on the fresh copy.
|
|
def boom(src, dst, *a, **kw):
|
|
raise OSError(28, "No space left on device")
|
|
|
|
monkeypatch.setattr(update_cmd.shutil, "copytree", boom)
|
|
with pytest.raises(OSError):
|
|
update_cmd._stage_replacement(str(new / "agent"), str(live / "agent"))
|
|
monkeypatch.undo()
|
|
|
|
# The old tree must have been restored to dst before the failure.
|
|
assert (live / "agent" / "version.txt").read_text() == "old"
|
|
assert not backup.exists()
|
|
|
|
# And a clean retry completes the update normally.
|
|
staged = _stage_all(live, new, ["agent"])
|
|
update_cmd._commit_staged_replacements(staged)
|
|
assert (live / "agent" / "version.txt").read_text() == "new"
|
|
assert not [p for p in os.listdir(live) if "hermes-update" in p]
|
|
|
|
def test_commit_failure_plus_discard_leaves_no_staging_litter(tmp_path, monkeypatch):
|
|
"""Phase-2 failure must not orphan staging copies for unswapped entries.
|
|
|
|
_update_via_zip calls _discard_staged when _commit_staged_replacements
|
|
raises. The rollback restores every swapped entry, but staging copies for
|
|
the not-yet-swapped entries (potentially most of a full tree) would
|
|
otherwise survive — and the retry's up-front free-space check runs BEFORE
|
|
the lazy per-entry leftover cleanup, so the litter makes the retry fail
|
|
harder than the original attempt. This pins the combination: rollback +
|
|
discard leaves the old tree intact and ZERO update litter."""
|
|
live, new = tmp_path / "live", tmp_path / "new"
|
|
_live_tree(live, {"agent": "old", "tools": "old", "gateway": "old"})
|
|
_live_tree(new, {"agent": "new", "tools": "new", "gateway": "new"})
|
|
staged = _stage_all(live, new, ["agent", "tools", "gateway"])
|
|
|
|
real_rename = os.rename
|
|
calls = {"n": 0}
|
|
|
|
def flaky_rename(src, dst):
|
|
calls["n"] += 1
|
|
if calls["n"] == 4: # first entry fully swapped, second breaks
|
|
raise OSError("simulated AV interference")
|
|
return real_rename(src, dst)
|
|
|
|
monkeypatch.setattr(update_cmd.os, "rename", flaky_rename)
|
|
with pytest.raises(OSError):
|
|
try:
|
|
update_cmd._commit_staged_replacements(staged)
|
|
except OSError:
|
|
# Mirrors the _update_via_zip wiring.
|
|
update_cmd._discard_staged(staged)
|
|
raise
|
|
monkeypatch.undo()
|
|
|
|
# Old tree intact...
|
|
for n in ("agent", "tools", "gateway"):
|
|
assert (live / n / "version.txt").read_text() == "old"
|
|
# ...and zero litter of any kind (staging OR backup).
|
|
litter = [p for p in os.listdir(live) if "hermes-update" in p]
|
|
assert litter == [], f"orphaned update litter: {litter}"
|