9ce7547faf
- _git_run(network=True) now carries a 300s timeout; a dead-stalled fetch (HTTP/2 to GitHub on some networks, black-holed proxy) becomes a failed run whose stderr names the stall instead of an update pinned on 'Fetching updates...' forever (#93759, #95777). Local git stays unbounded. - The apply path prunes stale .git/shallow grafts alongside its existing lock/tmp_pack cleanup, so installs that already accumulated grafts from past depth-1 checks (#105951: 57 entries) heal on their next update, not only on --check.
44 lines
1.9 KiB
Python
44 lines
1.9 KiB
Python
"""A dead-stalled network fetch ends `hermes update` with an error, never a hang (#93759, #95777).
|
|
|
|
`_git_run(network=True)` bounds the wait; a `TimeoutExpired` becomes a failed
|
|
CompletedProcess whose stderr names the stall, so every caller's existing
|
|
fetch-failure path prints one clear line. Local git (network=False) is unbounded.
|
|
"""
|
|
|
|
import subprocess
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import hermes_cli.update_cmd as update_cmd
|
|
|
|
|
|
def _timeout(cmd, **kwargs):
|
|
if "timeout" in kwargs:
|
|
raise subprocess.TimeoutExpired(cmd, kwargs["timeout"])
|
|
return MagicMock(returncode=0, stdout="ok", stderr="")
|
|
|
|
|
|
def test_network_fetch_stall_becomes_a_failed_run_with_a_named_cause(monkeypatch):
|
|
monkeypatch.setattr(update_cmd, "_m", lambda: MagicMock(PROJECT_ROOT="/repo"))
|
|
with patch.object(update_cmd.subprocess, "run", side_effect=_timeout) as run:
|
|
result = update_cmd._git_run(["git"], ["fetch", "origin", "main"], network=True)
|
|
|
|
assert result.returncode != 0
|
|
assert "timed out" in result.stderr and "fetch" in result.stderr
|
|
assert run.call_args.kwargs["timeout"] == update_cmd.NETWORK_GIT_TIMEOUT_SECONDS
|
|
# The no-prompt guard still rides along with the bound.
|
|
assert run.call_args.kwargs["env"]["GIT_TERMINAL_PROMPT"] == "0"
|
|
|
|
|
|
def test_local_git_stays_unbounded_and_check_true_raises(monkeypatch):
|
|
monkeypatch.setattr(update_cmd, "_m", lambda: MagicMock(PROJECT_ROOT="/repo"))
|
|
with patch.object(update_cmd.subprocess, "run", side_effect=_timeout) as run:
|
|
assert update_cmd._git_run(["git"], ["rev-parse", "HEAD"]).returncode == 0
|
|
assert "timeout" not in run.call_args.kwargs
|
|
|
|
try:
|
|
update_cmd._git_run(["git"], ["fetch", "origin", "main"], network=True, check=True)
|
|
except subprocess.CalledProcessError as exc:
|
|
assert exc.returncode == 124
|
|
else:
|
|
raise AssertionError("check=True must raise on a timed-out fetch")
|