mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-11-16 19:36:54 +00:00
# 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
321 lines
11 KiB
Python
321 lines
11 KiB
Python
import io
|
|
import json
|
|
import os
|
|
import sys
|
|
import threading
|
|
import time
|
|
|
|
|
|
from tui_gateway import compute_host, server
|
|
from tui_gateway.compute_host import ComputeHost, _default_workers
|
|
from tui_gateway.host_supervisor import (
|
|
HostSupervisor,
|
|
append_log_record,
|
|
)
|
|
|
|
|
|
def _json_lines(out: io.StringIO) -> list[dict]:
|
|
frames = []
|
|
for line in out.getvalue().splitlines():
|
|
if line.strip():
|
|
frames.append(json.loads(line))
|
|
return frames
|
|
|
|
|
|
def _wait_for_frame(out: io.StringIO, predicate, timeout: float = 2.0) -> dict:
|
|
deadline = time.monotonic() + timeout
|
|
while time.monotonic() < deadline:
|
|
for frame in _json_lines(out):
|
|
if predicate(frame):
|
|
return frame
|
|
time.sleep(0.01)
|
|
raise AssertionError(f"timed out waiting for frame; saw={_json_lines(out)}")
|
|
|
|
|
|
def test_compute_host_workers_inherit_tui_pool_env(monkeypatch):
|
|
monkeypatch.delenv("HERMES_TUI_RPC_POOL_WORKERS", raising=False)
|
|
monkeypatch.delenv("HERMES_COMPUTE_HOST_WORKERS", raising=False)
|
|
default = _default_workers()
|
|
|
|
monkeypatch.setenv("HERMES_TUI_RPC_POOL_WORKERS", "11")
|
|
assert _default_workers() == 11
|
|
|
|
# Malformed env falls back to the same default as unset.
|
|
monkeypatch.setenv("HERMES_TUI_RPC_POOL_WORKERS", "not-an-int")
|
|
assert _default_workers() == default
|
|
|
|
|
|
def test_compute_host_routes_relayed_response_and_lock_to_its_open_request(monkeypatch):
|
|
"""The child owns the server request's wait: a relayed client response frame resolves it in-process,
|
|
and a relayed ``clarify.lock`` is answered with that method's result for the parent to ack."""
|
|
from tui_gateway import server_requests
|
|
out = io.StringIO()
|
|
host = ComputeHost(stdout=out, heartbeat_secs=0)
|
|
sid = "host-clarify"
|
|
server._sessions[sid] = {"history_lock": threading.Lock()}
|
|
req = server_requests.ServerRequest(sid, "clarify", {"question": "?"})
|
|
with server_requests._lock:
|
|
server_requests._open[req.id] = req
|
|
locks = []
|
|
monkeypatch.setitem(server._methods, "clarify.lock",
|
|
lambda rid, params: locks.append((rid, dict(params))) or {"result": {"status": "ok", "remaining": []}})
|
|
|
|
try:
|
|
host._handle_respond({"sid": sid, "request_id": "relay-lock",
|
|
"params": {"lock": {"request_id": req.id, "question_id": "q0", "answer": "a"}}})
|
|
assert locks == [("relay-lock", {"request_id": req.id, "question_id": "q0", "answer": "a"})]
|
|
assert _json_lines(out)[-1]["response"] == {"result": {"status": "ok", "remaining": []}}
|
|
|
|
host._handle_respond({"sid": sid, "request_id": "relay-response",
|
|
"params": {"frame": {"jsonrpc": "2.0", "id": req.id, "result": {"answer": "yes"}}}})
|
|
assert req.answered and req.result == {"answer": "yes"} and req.event.is_set()
|
|
frame = _json_lines(out)[-1]
|
|
assert frame["type"] == "respond.ack" and frame["response"]["result"] == {"status": "ok"}
|
|
finally:
|
|
server._sessions.pop(sid, None)
|
|
server_requests.reset_for_tests()
|
|
host.close()
|
|
|
|
|
|
|
|
|
|
def test_append_log_record_single_write_lines(tmp_path):
|
|
path = tmp_path / "agent.log"
|
|
|
|
def writer(i: int) -> None:
|
|
append_log_record(path, f"line-{i:03d}-" + ("x" * 2000))
|
|
|
|
threads = [threading.Thread(target=writer, args=(i,)) for i in range(32)]
|
|
for thread in threads:
|
|
thread.start()
|
|
for thread in threads:
|
|
thread.join()
|
|
|
|
lines = path.read_text(encoding="utf-8").splitlines()
|
|
assert len(lines) == 32
|
|
assert sorted(line.split("-", 2)[1] for line in lines) == [f"{i:03d}" for i in range(32)]
|
|
assert all(line.endswith("x" * 2000) for line in lines)
|
|
|
|
|
|
def test_supervisor_startup_reconcile_pid_reuse_guard(tmp_path, monkeypatch):
|
|
registry = tmp_path / "dashboard-compute-host.json"
|
|
registry.write_text(json.dumps({"host_pid": os.getpid(), "boot_id": "stale"}), encoding="utf-8")
|
|
|
|
killed: list[int] = []
|
|
supervisor = HostSupervisor(registry_path=registry, argv=[sys.executable, "-c", ""], autostart=False)
|
|
monkeypatch.setattr(supervisor, "_pid_matches_compute_host", lambda _pid: False)
|
|
monkeypatch.setattr(supervisor, "_terminate_pid", lambda pid, **_kw: killed.append(pid))
|
|
|
|
result = supervisor.reconcile_startup_orphan()
|
|
|
|
assert result == "pid-reuse-ignored"
|
|
assert killed == []
|
|
assert not registry.exists()
|
|
|
|
|
|
def _make_compress_host_session(events: list) -> dict:
|
|
class _Agent:
|
|
model = "host-model"
|
|
provider = "host-provider"
|
|
tools = []
|
|
_cached_system_prompt = ""
|
|
session_input_tokens = 1
|
|
session_output_tokens = 1
|
|
session_prompt_tokens = 1
|
|
session_completion_tokens = 1
|
|
session_total_tokens = 2
|
|
session_api_calls = 1
|
|
session_id = "rotated-id"
|
|
|
|
agent = _Agent()
|
|
agent.context_compressor = type("ContextEngineStub", (), {})()
|
|
agent.context_compressor.on_session_start = (
|
|
lambda *_args, **_kwargs: events.append("notify")
|
|
)
|
|
return {
|
|
"agent": agent,
|
|
"session_key": "before-key",
|
|
"history": [
|
|
{"role": "user", "content": "before"},
|
|
{"role": "assistant", "content": "before"},
|
|
],
|
|
"history_lock": threading.Lock(),
|
|
"history_version": 2,
|
|
"running": False,
|
|
"manual_compression_lock": threading.Lock(),
|
|
}
|
|
|
|
|
|
def _record_finalize(monkeypatch, events: list[str], *sids: str) -> None:
|
|
"""Give ``flush_all_sessions`` sessions and record which ones finalize."""
|
|
keys = sids or ("s1",)
|
|
monkeypatch.setattr(
|
|
server,
|
|
"_sessions",
|
|
{sid: {"session_key": sid} for sid in keys},
|
|
raising=False,
|
|
)
|
|
monkeypatch.setattr(
|
|
server,
|
|
"_finalize_session",
|
|
lambda _session, end_reason="tui_close": events.append(
|
|
f"finalize:{_session['session_key']}:{end_reason}"
|
|
),
|
|
raising=False,
|
|
)
|
|
|
|
|
|
def _register_turn(host: ComputeHost, fn, sid: str = "s1") -> None:
|
|
"""Submit a turn exactly the way ``_handle_turn_start`` does."""
|
|
host._track_turn_future(host._executor.submit(fn), sid)
|
|
|
|
|
|
def test_shutdown_drains_in_flight_turn_before_finalizing_sessions(monkeypatch):
|
|
events: list[str] = []
|
|
_record_finalize(monkeypatch, events)
|
|
|
|
host = ComputeHost(stdout=io.StringIO(), heartbeat_secs=0)
|
|
running = threading.Event()
|
|
|
|
def _turn() -> None:
|
|
running.set()
|
|
time.sleep(0.3)
|
|
events.append("turn_end")
|
|
|
|
_register_turn(host, _turn, sid="s1")
|
|
assert running.wait(timeout=5.0)
|
|
|
|
host.shutdown(reason="sigterm", wait=3.0)
|
|
|
|
# ``_finalize_session`` latches on ``session["_finalized"]``, so its single
|
|
# run has to observe the finished turn or the tail is unpersistable. A turn
|
|
# that *did* drain must still finalize — the live-turn skip must not
|
|
# over-reach into sessions whose work is done.
|
|
assert events == ["turn_end", "finalize:s1:compute_host_sigterm"]
|
|
|
|
# The done-callback still has to remove the entry now that the container is
|
|
# a dict: ``set.discard`` was a valid bare callback, ``dict.pop`` is not.
|
|
deadline = time.monotonic() + 2.0
|
|
while host._turn_futures and time.monotonic() < deadline:
|
|
time.sleep(0.01)
|
|
assert host._turn_futures == {}, "in-flight turns must not accumulate"
|
|
|
|
|
|
def test_shutdown_retains_a_live_turns_session_when_the_drain_deadline_expires(monkeypatch):
|
|
wait = 1.0
|
|
events: list[str] = []
|
|
_record_finalize(monkeypatch, events, "live", "idle")
|
|
|
|
host = ComputeHost(stdout=io.StringIO(), heartbeat_secs=0)
|
|
release = threading.Event()
|
|
running = threading.Event()
|
|
|
|
def _stuck_turn() -> None:
|
|
running.set()
|
|
release.wait(timeout=30.0)
|
|
|
|
_register_turn(host, _stuck_turn, sid="live")
|
|
assert running.wait(timeout=5.0)
|
|
|
|
try:
|
|
started = time.monotonic()
|
|
host.shutdown(reason="sigterm", wait=wait)
|
|
elapsed = time.monotonic() - started
|
|
finally:
|
|
release.set()
|
|
|
|
# ``_finalize_session`` is one-shot, and the ``shutdown(wait=False)`` that
|
|
# follows does not join the turn. Spending "live"'s single latch mid-turn
|
|
# would leave it permanently un-finalizable and release its active-session
|
|
# lease out from under running work — the same lifecycle race the drain
|
|
# exists to close, just moved past the deadline. It is retained unfinalized
|
|
# for recovery instead. A turn outliving the window must not cost the flush
|
|
# for anyone else, so "idle" still finalizes in the same pass.
|
|
assert events == ["finalize:idle:compute_host_sigterm"]
|
|
assert elapsed < wait
|
|
|
|
|
|
def test_shutdown_retains_live_sessions_within_the_stdin_closed_budget(monkeypatch):
|
|
"""The tightest real budget any caller uses is ``wait=2.0``.
|
|
|
|
``run_host`` finalizes through ``host.shutdown(reason="stdin_closed",
|
|
wait=2.0)``, which is where the reserve — ``wait`` minus
|
|
``min(_FLUSH_RESERVE_SECS, wait / 2)`` — has the least room to work with.
|
|
The retain-live-sessions rule must hold there without costing the flush for
|
|
idle sessions and without pushing the call past the budget the supervisor's
|
|
kill escalation is timed against.
|
|
"""
|
|
wait = 2.0
|
|
drain_budget = wait - min(compute_host._FLUSH_RESERVE_SECS, wait / 2.0)
|
|
|
|
events: list[str] = []
|
|
_record_finalize(monkeypatch, events, "live", "idle")
|
|
|
|
host = ComputeHost(stdout=io.StringIO(), heartbeat_secs=0)
|
|
release = threading.Event()
|
|
running = threading.Event()
|
|
|
|
def _stuck_turn() -> None:
|
|
running.set()
|
|
release.wait(timeout=30.0)
|
|
|
|
_register_turn(host, _stuck_turn, sid="live")
|
|
assert running.wait(timeout=5.0)
|
|
|
|
try:
|
|
started = time.monotonic()
|
|
host.shutdown(reason="stdin_closed", wait=wait)
|
|
elapsed = time.monotonic() - started
|
|
finally:
|
|
release.set()
|
|
|
|
assert events == ["finalize:idle:compute_host_stdin_closed"]
|
|
assert elapsed >= drain_budget - 1e-6, "the drain must use its full window"
|
|
assert elapsed < wait
|
|
|
|
|
|
def test_shutdown_drain_sleep_never_overshoots_the_reserve(monkeypatch):
|
|
"""The drain's per-tick sleep must be bounded by the time left to it.
|
|
|
|
A flat tick overshoots the drain deadline by up to one tick, eating the
|
|
reserve held back for ``flush_all_sessions``; for a small ``wait`` that is
|
|
the whole reserve. Asserting on the *requested* sleep totals rather than on
|
|
wall-clock keeps this deterministic: each sleep is clamped to the remaining
|
|
time, so the sum can never exceed the drain budget however the scheduler
|
|
interleaves.
|
|
"""
|
|
wait = 0.34
|
|
drain_budget = wait - min(compute_host._FLUSH_RESERVE_SECS, wait / 2.0)
|
|
|
|
events: list[str] = []
|
|
_record_finalize(monkeypatch, events, "idle")
|
|
|
|
slept: list[float] = []
|
|
clock = [100.0]
|
|
monkeypatch.setattr(compute_host.time, "monotonic", lambda: clock[0])
|
|
|
|
def _recording_sleep(seconds: float) -> None:
|
|
slept.append(seconds)
|
|
clock[0] += seconds
|
|
|
|
monkeypatch.setattr(compute_host.time, "sleep", _recording_sleep)
|
|
|
|
host = ComputeHost(stdout=io.StringIO(), heartbeat_secs=0)
|
|
release = threading.Event()
|
|
running = threading.Event()
|
|
|
|
def _stuck_turn() -> None:
|
|
running.set()
|
|
release.wait(timeout=30.0)
|
|
|
|
_register_turn(host, _stuck_turn, sid="live")
|
|
assert running.wait(timeout=5.0)
|
|
|
|
try:
|
|
host.shutdown(reason="sigterm", wait=wait)
|
|
finally:
|
|
release.set()
|
|
|
|
assert events == ["finalize:idle:compute_host_sigterm"]
|
|
assert slept, "the drain loop should have ticked at least once"
|
|
assert sum(slept) <= drain_budget + 1e-6
|