427d4936c2
The merges from main kept or added about 45 test files written against the
legacy updater and installer seams that pm-clean replaced. Each failing test
was checked against the current code:
- Deleted, because every test targets code that pm-clean removed or that is
only reachable from dead or frozen old-updater code:
update_orphan/handoff_backend_reap, handoff_desktop_rebuild,
interrupted_recovery (it also launched a real completion against the live
checkout), update_stale_virtualenv, update_venv_health,
verify_core_dependencies, lazy_refresh_venv_repair,
certifi_repair (already dropped in 2f20ceb6f7; the merge resurrected it),
banner_git_state (covered by test_source_check).
- Retargeted where production reads now:
- version identity via version_info.get_code_identity
- update receipts via a ContextVar scope
- pm.extras / pm.installed_package / pm.ensure_import for matrix,
computer_use, fal and tirith
- install hints via pm.install_hint
- the lock pins in pm/lock.json
- probe_root for the critical-module probe
- Fixture repairs:
- git-committed trees for source stamps
- activate's real `--runtime-only` argument
- a semver install stamp for requires_hermes gates
- the Windows gateway restart after a verified update
- snowflake-length ids that cannot collide with the runner uid
- Collection fix: one platforms() marker per test in gateway_proc_fallback.
97 lines
3.6 KiB
Python
97 lines
3.6 KiB
Python
"""Regression tests for #83220: oversized approvals.timeout must never
|
|
overflow platform wait primitives (macOS time_t OverflowError).
|
|
|
|
The clamp lives at the single config-read site (_get_approval_timeout), so
|
|
every consumer — CLI prompt thread.join, gateway poll deadline, human-wait
|
|
ceiling, and the tool_executor authorization gate — is covered at once.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import threading
|
|
|
|
from unittest.mock import patch
|
|
|
|
from agent.deadline import MAX_SAFE_TIMEOUT_S
|
|
|
|
|
|
def _with_configured_timeout(value):
|
|
return patch(
|
|
"tools.approval_context._get_approval_config",
|
|
return_value={"timeout": value},
|
|
)
|
|
|
|
|
|
class TestApprovalTimeoutOverflowClamp:
|
|
def test_normal_value_passes_through(self):
|
|
from tools.approval_context import _get_approval_timeout
|
|
|
|
with _with_configured_timeout(300):
|
|
assert _get_approval_timeout() == 300
|
|
|
|
def test_oversized_value_clamped(self):
|
|
from tools.approval_context import _get_approval_timeout
|
|
|
|
with _with_configured_timeout(10**18):
|
|
assert _get_approval_timeout() == int(MAX_SAFE_TIMEOUT_S)
|
|
|
|
def test_invalid_value_falls_back_to_default(self):
|
|
from tools.approval_context import _get_approval_timeout
|
|
|
|
with _with_configured_timeout("soon"):
|
|
assert _get_approval_timeout() == 300
|
|
|
|
def test_oversized_float_value_clamped(self):
|
|
# YAML `1e18` arrives as a float, not an int — different int() path
|
|
# than the string/int forms; the clamp must cover it too.
|
|
from tools.approval_context import _get_approval_timeout
|
|
|
|
with _with_configured_timeout(1e18):
|
|
assert _get_approval_timeout() == int(MAX_SAFE_TIMEOUT_S)
|
|
|
|
|
|
|
|
def test_clamped_value_safe_for_lock_acquire(self):
|
|
# The exact primitive that crashed in #83220: Lock.acquire on macOS
|
|
# converts the relative timeout to an absolute time_t timestamp.
|
|
from tools.approval_context import _get_approval_timeout
|
|
|
|
with _with_configured_timeout(10**18):
|
|
timeout = _get_approval_timeout()
|
|
lock = threading.Lock()
|
|
assert lock.acquire(timeout=timeout) # would raise OverflowError unclamped
|
|
lock.release()
|
|
|
|
|
|
def test_human_wait_ceiling_inherits_clamp(self):
|
|
from tools.approval_human_wait import human_wait_ceiling
|
|
|
|
with _with_configured_timeout(10**18):
|
|
ceiling = human_wait_ceiling()
|
|
# The margin must not push the clamped timeout back past the safe cap.
|
|
assert int(MAX_SAFE_TIMEOUT_S) <= ceiling <= MAX_SAFE_TIMEOUT_S
|
|
lock = threading.Lock()
|
|
assert lock.acquire(timeout=ceiling)
|
|
lock.release()
|
|
|
|
def test_authorization_gate_timeout_safe_and_extends_with_config(self):
|
|
# The gate bound must (a) be platform-safe with an oversized config
|
|
# and (b) still EXTEND beyond the 360s fallback when approvals.timeout
|
|
# is legitimately larger — clamping it down to the fallback would
|
|
# break serialization while a real prompt is still answerable (#79719).
|
|
from agent.tool_executor import (
|
|
_AUTHORIZATION_GATE_LOCK_TIMEOUT_S,
|
|
_authorization_gate_lock_timeout,
|
|
)
|
|
|
|
with _with_configured_timeout(10**18):
|
|
bound = _authorization_gate_lock_timeout()
|
|
lock = threading.Lock()
|
|
assert lock.acquire(timeout=bound)
|
|
lock.release()
|
|
|
|
with _with_configured_timeout(3600):
|
|
bound = _authorization_gate_lock_timeout()
|
|
assert bound > _AUTHORIZATION_GATE_LOCK_TIMEOUT_S
|
|
assert bound == 3600 + 60.0 # approvals.timeout + HUMAN_WAIT_MARGIN_S
|