Import AITURK IDE 1.0.0-beta.1 from Hermes 63279301; preserve MIT license
This commit is contained in:
@@ -0,0 +1,167 @@
|
||||
"""Focused tests for dashboard PTY reconnect breadcrumbs."""
|
||||
|
||||
import json
|
||||
import sys
|
||||
from pathlib import Path
|
||||
from urllib.parse import urlencode
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
pytestmark = pytest.mark.skipif(
|
||||
sys.platform.startswith("win"), reason="PTY bridge is POSIX-only"
|
||||
)
|
||||
|
||||
|
||||
class _OneFrameBridge:
|
||||
def __init__(self):
|
||||
self._sent = False
|
||||
self.closed = False
|
||||
|
||||
@classmethod
|
||||
def spawn(cls, *args, **kwargs):
|
||||
return cls()
|
||||
|
||||
def read(self, timeout):
|
||||
if not self._sent:
|
||||
self._sent = True
|
||||
return b"ready"
|
||||
return None
|
||||
|
||||
def resize(self, *, cols, rows):
|
||||
pass
|
||||
|
||||
def write(self, raw):
|
||||
pass
|
||||
|
||||
def close(self):
|
||||
self.closed = True
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def pty_client(monkeypatch, _isolate_hermes_home):
|
||||
from starlette.testclient import TestClient
|
||||
|
||||
import hermes_cli.web_server as ws
|
||||
|
||||
monkeypatch.setattr(ws, "_DASHBOARD_EMBEDDED_CHAT_ENABLED", True)
|
||||
monkeypatch.setattr(ws.PtyBridge, "spawn", _OneFrameBridge.spawn)
|
||||
ws.app.state.pty_active_session_files = {}
|
||||
|
||||
client = TestClient(ws.app)
|
||||
return ws, client, ws._SESSION_TOKEN
|
||||
|
||||
|
||||
def _url(token: str, **params: str) -> str:
|
||||
return f"/api/pty?{urlencode({'token': token, **params})}"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
def test_fresh_param_ignores_channel_active_session_file(pty_client, monkeypatch):
|
||||
"""Explicit fresh starts must not resurrect the prior channel session."""
|
||||
ws, client, token = pty_client
|
||||
channel = "fresh-chan"
|
||||
active_file = ws._active_session_file_for_channel(ws.app, channel)
|
||||
active_file.write_text(json.dumps({"session_id": "sess-old"}), encoding="utf-8")
|
||||
captured = {}
|
||||
|
||||
def fake_resolve(resume=None, sidecar_url=None, profile=None, active_session_file=None):
|
||||
captured["active_session_file"] = active_session_file
|
||||
captured["resume"] = resume
|
||||
return (["fake-hermes-tui"], None, None)
|
||||
|
||||
monkeypatch.setattr(ws, "_resolve_chat_argv", fake_resolve)
|
||||
|
||||
with client.websocket_connect(_url(token, channel=channel, fresh="1")) as conn:
|
||||
assert conn.receive_bytes() == b"ready"
|
||||
|
||||
assert captured["resume"] is None
|
||||
assert captured["active_session_file"] == str(active_file)
|
||||
assert not active_file.exists()
|
||||
|
||||
|
||||
def test_active_session_fallback_sends_resume_control_message(pty_client, monkeypatch):
|
||||
"""Implicit resume (no `?resume=`) must tell the client which session.
|
||||
|
||||
Regression for #93518: the dashboard's stick-to-bottom replay logic only
|
||||
fires when the frontend can see a resume id. Without `?resume=` on the URL
|
||||
it previously had no way to learn that `pty_ws` fell back to the
|
||||
per-channel active-session file, so the viewport stayed pinned at the top
|
||||
of the replayed scrollback.
|
||||
"""
|
||||
ws, client, token = pty_client
|
||||
channel = "implicit-resume-chan"
|
||||
active_file = ws._active_session_file_for_channel(ws.app, channel)
|
||||
active_file.write_text(json.dumps({"session_id": "sess-old"}), encoding="utf-8")
|
||||
|
||||
monkeypatch.setattr(
|
||||
ws, "_resolve_chat_argv", lambda **kw: (["fake-hermes-tui"], None, None)
|
||||
)
|
||||
|
||||
with client.websocket_connect(_url(token, channel=channel)) as conn:
|
||||
assert conn.receive_json() == {"type": "resume", "id": "sess-old"}
|
||||
assert conn.receive_bytes() == b"ready"
|
||||
|
||||
|
||||
def test_explicit_resume_sends_no_control_message(pty_client, monkeypatch):
|
||||
"""An explicit `?resume=` already tells the client via the URL param."""
|
||||
ws, client, token = pty_client
|
||||
channel = "explicit-resume-chan"
|
||||
|
||||
monkeypatch.setattr(
|
||||
ws, "_resolve_chat_argv", lambda **kw: (["fake-hermes-tui"], None, None)
|
||||
)
|
||||
|
||||
with client.websocket_connect(
|
||||
_url(token, channel=channel, resume="sess-explicit")
|
||||
) as conn:
|
||||
# The first (and only) frame is PTY output, not a control message.
|
||||
assert conn.receive_bytes() == b"ready"
|
||||
|
||||
|
||||
def test_child_eof_closes_socket_and_bridge(pty_client, monkeypatch):
|
||||
"""Child EOF must close the WS server-side and reap the PTY.
|
||||
|
||||
Regression for the FD leak (#54028): the reader task hits EOF when the
|
||||
PTY child exits, but if the browser's socket is half-open (no FIN), the
|
||||
writer loop's ``ws.receive()`` would block forever and the PTY fds would
|
||||
never be closed. The reader now closes the WebSocket on EOF so the
|
||||
handler's ``finally`` runs ``bridge.close()``.
|
||||
"""
|
||||
ws, client, token = pty_client
|
||||
bridges = []
|
||||
|
||||
class _RecordingBridge(_OneFrameBridge):
|
||||
@classmethod
|
||||
def spawn(cls, *args, **kwargs):
|
||||
b = cls()
|
||||
bridges.append(b)
|
||||
return b
|
||||
|
||||
monkeypatch.setattr(ws.PtyBridge, "spawn", _RecordingBridge.spawn)
|
||||
monkeypatch.setattr(
|
||||
ws, "_resolve_chat_argv", lambda **kw: (["fake-hermes-tui"], None, None)
|
||||
)
|
||||
|
||||
# The client never sends a disconnect of its own — it only reads the one
|
||||
# frame then the server side must tear everything down on child EOF.
|
||||
with client.websocket_connect(_url(token, channel="eof-chan")) as conn:
|
||||
assert conn.receive_bytes() == b"ready"
|
||||
# Server closes the socket after the child EOFs; receiving again
|
||||
# surfaces the close rather than hanging.
|
||||
with pytest.raises(Exception):
|
||||
conn.receive_bytes()
|
||||
|
||||
assert len(bridges) == 1
|
||||
# bridge.close() runs in the handler's `finally` via asyncio.to_thread,
|
||||
# which can lag the client-side context exit by a tick or two. Poll briefly
|
||||
# instead of asserting immediately so the teardown isn't a race.
|
||||
import time
|
||||
|
||||
deadline = time.monotonic() + 5.0
|
||||
while not bridges[0].closed and time.monotonic() < deadline:
|
||||
time.sleep(0.01)
|
||||
assert bridges[0].closed is True
|
||||
Reference in New Issue
Block a user