# 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
149 lines
5.0 KiB
Python
149 lines
5.0 KiB
Python
"""Aborted-fetch tmp_pack debris sweep (#93732, campaign #91277).
|
|
|
|
Every git fetch that dies mid-transfer strands a tmp_pack_* file in
|
|
.git/objects/pack; git never cleans them. clear_stale_tmp_packs() removes
|
|
them with the same age + live-git-process safety contract the lock sweep
|
|
uses.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
import os
|
|
import time
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
from hermes_cli.gitlock import (
|
|
STALE_TMP_PACK_MIN_AGE_SECONDS,
|
|
clear_stale_tmp_packs,
|
|
)
|
|
|
|
|
|
def _mkrepo(tmp_path: Path) -> Path:
|
|
pack = tmp_path / ".git" / "objects" / "pack"
|
|
pack.mkdir(parents=True)
|
|
return tmp_path
|
|
|
|
|
|
def _age(path: Path, seconds: float) -> None:
|
|
stamp = time.time() - seconds
|
|
os.utime(path, (stamp, stamp))
|
|
|
|
|
|
def test_removes_old_tmp_pack_debris(tmp_path, monkeypatch):
|
|
repo = _mkrepo(tmp_path)
|
|
monkeypatch.setattr("hermes_cli.gitlock._git_proc_running", lambda: False)
|
|
pack = repo / ".git" / "objects" / "pack"
|
|
|
|
debris = []
|
|
for name in ("tmp_pack_AbCd12", "tmp_idx_XyZ", "tmp_rev_Q1", "tmp_mtimes_M8"):
|
|
p = pack / name
|
|
p.write_bytes(b"x" * 128)
|
|
_age(p, STALE_TMP_PACK_MIN_AGE_SECONDS + 60)
|
|
debris.append(p)
|
|
|
|
removed = clear_stale_tmp_packs(repo)
|
|
assert len(removed) == 4
|
|
for p in debris:
|
|
assert not p.exists()
|
|
|
|
|
|
def test_spares_fresh_debris_and_real_packs(tmp_path, monkeypatch):
|
|
repo = _mkrepo(tmp_path)
|
|
monkeypatch.setattr("hermes_cli.gitlock._git_proc_running", lambda: False)
|
|
pack = repo / ".git" / "objects" / "pack"
|
|
|
|
fresh = pack / "tmp_pack_fresh" # a fetch may be writing this NOW
|
|
fresh.write_bytes(b"y")
|
|
real_pack = pack / "pack-abc123.pack" # real object data — never touch
|
|
real_pack.write_bytes(b"z" * 64)
|
|
real_idx = pack / "pack-abc123.idx"
|
|
real_idx.write_bytes(b"z")
|
|
_age(real_pack, 10 * 24 * 3600) # even when ancient
|
|
_age(real_idx, 10 * 24 * 3600)
|
|
|
|
removed = clear_stale_tmp_packs(repo)
|
|
assert removed == []
|
|
assert fresh.exists() and real_pack.exists() and real_idx.exists()
|
|
|
|
|
|
def test_skips_sweep_while_git_is_running(tmp_path, monkeypatch):
|
|
repo = _mkrepo(tmp_path)
|
|
monkeypatch.setattr("hermes_cli.gitlock._git_proc_running", lambda: True)
|
|
pack = repo / ".git" / "objects" / "pack"
|
|
p = pack / "tmp_pack_old"
|
|
p.write_bytes(b"x")
|
|
_age(p, STALE_TMP_PACK_MIN_AGE_SECONDS + 60)
|
|
|
|
assert clear_stale_tmp_packs(repo) == []
|
|
assert p.exists()
|
|
|
|
|
|
def test_bare_repo_pack_dir_is_swept(tmp_path, monkeypatch):
|
|
"""A bare repo (e.g. the checkpoint store) has no .git/ layer — objects/pack hangs directly
|
|
off the repo root, where a gc killed mid-repack strands the same debris (#115410)."""
|
|
monkeypatch.setattr("hermes_cli.gitlock._git_proc_running", lambda: False)
|
|
pack = tmp_path / "objects" / "pack"
|
|
pack.mkdir(parents=True)
|
|
debris = pack / "tmp_pack_killedGc"
|
|
debris.write_bytes(b"x" * 256)
|
|
_age(debris, STALE_TMP_PACK_MIN_AGE_SECONDS + 60)
|
|
|
|
removed = clear_stale_tmp_packs(tmp_path)
|
|
assert removed == [str(debris)]
|
|
assert not debris.exists()
|
|
|
|
|
|
def test_no_git_dir_is_a_noop(tmp_path):
|
|
assert clear_stale_tmp_packs(tmp_path) == []
|
|
|
|
|
|
|
|
|
|
@pytest.mark.platforms("windows")
|
|
def test_windows_readonly_debris_is_cleared(tmp_path, monkeypatch):
|
|
"""git renames its transfer temps into place read-only, and Windows refuses to unlink a
|
|
read-only file with EACCES — the exact rule that let aborted-fetch debris survive this
|
|
sweep for months (#116384). Runs on a real Windows host: no faked unlink, no faked OS."""
|
|
repo = _mkrepo(tmp_path)
|
|
monkeypatch.setattr("hermes_cli.gitlock._git_proc_running", lambda: False)
|
|
pack = repo / ".git" / "objects" / "pack"
|
|
|
|
debris = pack / "tmp_pack_ReadOnly"
|
|
debris.write_bytes(b"x" * 128)
|
|
_age(debris, STALE_TMP_PACK_MIN_AGE_SECONDS + 60)
|
|
os.chmod(debris, 0o444) # read-only, as git writes its pack temps
|
|
|
|
removed = clear_stale_tmp_packs(repo)
|
|
assert removed == [str(debris)] # write bit cleared first, then unlinked
|
|
assert not debris.exists()
|
|
|
|
|
|
def test_unlink_failure_is_surfaced_at_warning(tmp_path, monkeypatch, caplog):
|
|
"""The skip used to be logged at debug, which hid the months-long Windows no-op sweep;
|
|
a cleaner that fails silently is worse than none, so every skip must be visible (#116384)."""
|
|
repo = _mkrepo(tmp_path)
|
|
monkeypatch.setattr("hermes_cli.gitlock._git_proc_running", lambda: False)
|
|
pack = repo / ".git" / "objects" / "pack"
|
|
stuck = pack / "tmp_pack_stuck"
|
|
stuck.write_bytes(b"x")
|
|
_age(stuck, STALE_TMP_PACK_MIN_AGE_SECONDS + 60)
|
|
|
|
real_unlink = Path.unlink
|
|
|
|
def failing_unlink(self, *a, **k):
|
|
if self.name == "tmp_pack_stuck":
|
|
raise OSError(13, "Permission denied")
|
|
return real_unlink(self, *a, **k)
|
|
|
|
monkeypatch.setattr(Path, "unlink", failing_unlink)
|
|
|
|
with caplog.at_level(logging.WARNING, logger="hermes_cli.gitlock"):
|
|
assert clear_stale_tmp_packs(repo) == []
|
|
assert any(
|
|
r.levelname == "WARNING" and "tmp_pack_stuck" in r.getMessage()
|
|
for r in caplog.records
|
|
)
|