test: make tests/ mirror the source tree; drop issue numbers from filenames
`scripts/run_tests.sh tests/<dir>/` is how a change gets its regression
coverage run, so a test filed under the wrong directory is a test nobody
runs when that code changes. Two kinds of drift had accumulated.
Parallel directories for one source package, folded into the mirror:
tests/acp -> tests/acp_adapter (its __init__/conftest move with it)
tests/cli -> tests/hermes_cli (prompt_toolkit fixture merged into
hermes_cli/conftest.py)
tests/run_agent -> tests/agent (backoff fixture becomes
agent/conftest.py)
tests/relay -> tests/gateway/relay
tests/state -> tests/hermes_state
246 loose files at tests/ root, routed by the package they import/patch:
hermes_cli, hermes_state, agent, gateway, tools, plugins, tui_gateway, cron.
Installer and desktop-update script tests go to tests/scripts/{install,
desktop_update}/. 43 tests of root-level modules (batch_runner, utils,
hermes_constants, packaging) stay at the root.
Filenames drop their issue numbers (95 files: test_89315_x.py -> test_x.py);
the number stays in the module docstring where it has context.
Collisions: test_cli_skin_integration.py existed in both tests/ and tests/cli
with different subsets — merged into one (10 tests, all kept);
run_agent/test_pre_compress_memory_context.py -> agent/..._handoff.py;
tests/test_account_usage.py -> agent/test_account_usage_fetch.py;
tests/test_web_server.py -> hermes_cli/test_web_server_ws_ping.py.
Deleted: test_minisweagent_path.py (empty since PR #2804),
test_model_picker_scroll.py (tested a private copy of the logic, imported
nothing), test_process_loop_event_loop_warning.py (asserted asyncio behaviour,
imported nothing from Hermes).
Repo-root path arithmetic (Path(__file__).parents[N], dirname chains) is
bumped for the 202 files that changed depth and verified by evaluating every
such expression against the new location. classify_changes' desktop-updater
lane prefix, tests-os.yml's ignore glob and every in-tree path comment follow
the moves. tests/test_tests_tree_layout.py keeps the tree from drifting back.
This commit is contained in:
teknium1
@@ -1,146 +0,0 @@
|
||||
import json
|
||||
|
||||
import pytest
|
||||
|
||||
from hermes_cli import web_server
|
||||
import hermes_cli.web_server_chat as _web_server_chat
|
||||
|
||||
|
||||
class FakeBridge:
|
||||
def __init__(self):
|
||||
self.alive = True
|
||||
self.accept_input = True
|
||||
self.written = bytearray()
|
||||
|
||||
def read(self, timeout):
|
||||
return b"" # idle forever
|
||||
|
||||
async def write(self, data):
|
||||
if not self.accept_input:
|
||||
return False
|
||||
self.written.extend(data)
|
||||
return True
|
||||
|
||||
def resize(self, cols, rows):
|
||||
pass
|
||||
|
||||
def close(self):
|
||||
self.alive = False
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def pty_keepalive_harness(monkeypatch):
|
||||
class Spawned(list):
|
||||
pass
|
||||
|
||||
spawned = Spawned()
|
||||
spawned.bridges = []
|
||||
|
||||
def fake_spawn(argv, cwd=None, env=None):
|
||||
b = FakeBridge()
|
||||
spawned.append(argv)
|
||||
spawned.bridges.append(b)
|
||||
return b
|
||||
|
||||
monkeypatch.setattr(_web_server_chat.PtyBridge, "spawn", staticmethod(fake_spawn))
|
||||
monkeypatch.setattr(_web_server_chat, "_ws_auth_reason", lambda ws: (None, "test"))
|
||||
monkeypatch.setattr(_web_server_chat, "_ws_host_origin_reason", lambda ws: None)
|
||||
monkeypatch.setattr(_web_server_chat, "_ws_client_reason", lambda ws: None)
|
||||
|
||||
async def fake_argv(**kw):
|
||||
resume = "child" if kw.get("resume") == "parent" else kw.get("resume")
|
||||
env = {"HERMES_TUI_RESUME": resume} if resume else {}
|
||||
return (["x", resume or "fresh"], "/tmp", env)
|
||||
|
||||
monkeypatch.setattr(_web_server_chat, "_resolve_chat_argv_async", fake_argv)
|
||||
|
||||
try:
|
||||
yield spawned
|
||||
finally:
|
||||
_web_server_chat.PTY_REGISTRY._sessions.clear()
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_attach_token_reuses_same_session(pty_keepalive_harness):
|
||||
"""Two connects with the same ?attach= token hit one spawned bridge."""
|
||||
from starlette.testclient import TestClient
|
||||
|
||||
client = TestClient(web_server.app)
|
||||
with client.websocket_connect("/api/pty?attach=TOK1") as ws1:
|
||||
ws1.send_bytes(b"hi")
|
||||
with client.websocket_connect("/api/pty?attach=TOK1") as ws2:
|
||||
ws2.send_bytes(b"again")
|
||||
assert len(pty_keepalive_harness) == 1 # reattached, did not respawn
|
||||
assert bytes(pty_keepalive_harness.bridges[0].written) == b"hi\x0cagain"
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_stalled_input_closes_only_the_keepalive_socket(
|
||||
pty_keepalive_harness,
|
||||
):
|
||||
from starlette.testclient import TestClient
|
||||
from starlette.websockets import WebSocketDisconnect
|
||||
|
||||
client = TestClient(web_server.app)
|
||||
with client.websocket_connect("/api/pty?attach=TOK1") as ws:
|
||||
bridge = pty_keepalive_harness.bridges[0]
|
||||
bridge.accept_input = False
|
||||
ws.send_bytes(b"input")
|
||||
with pytest.raises(WebSocketDisconnect) as exc_info:
|
||||
ws.receive_bytes()
|
||||
|
||||
assert exc_info.value.code == 1013
|
||||
assert web_server.PTY_REGISTRY._sessions["TOK1"].alive is False
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_attach_token_reuses_same_resume(pty_keepalive_harness):
|
||||
from starlette.testclient import TestClient
|
||||
|
||||
client = TestClient(web_server.app)
|
||||
with client.websocket_connect("/api/pty?attach=TOK1&resume=same") as ws1:
|
||||
ws1.send_bytes(b"hi")
|
||||
with client.websocket_connect("/api/pty?attach=TOK1&resume=same") as ws2:
|
||||
ws2.send_bytes(b"again")
|
||||
assert pty_keepalive_harness == [["x", "same"]]
|
||||
|
||||
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_attach_token_reuses_canonical_resume(pty_keepalive_harness):
|
||||
from starlette.testclient import TestClient
|
||||
|
||||
client = TestClient(web_server.app)
|
||||
with client.websocket_connect("/api/pty?attach=TOK1&resume=parent") as ws1:
|
||||
ws1.send_bytes(b"hi")
|
||||
with client.websocket_connect("/api/pty?attach=TOK1&resume=child") as ws2:
|
||||
ws2.send_bytes(b"again")
|
||||
assert pty_keepalive_harness == [["x", "child"]]
|
||||
|
||||
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_attach_token_reuses_default_chat_after_active_session_fallback(
|
||||
pty_keepalive_harness, tmp_path, monkeypatch
|
||||
):
|
||||
from starlette.testclient import TestClient
|
||||
|
||||
active_session_file = tmp_path / "active-session.json"
|
||||
monkeypatch.setattr(
|
||||
_web_server_chat,
|
||||
"_active_session_file_for_channel",
|
||||
lambda app, channel: active_session_file,
|
||||
)
|
||||
|
||||
client = TestClient(web_server.app)
|
||||
with client.websocket_connect("/api/pty?attach=TOK1&channel=CHAT") as ws1:
|
||||
ws1.send_bytes(b"hi")
|
||||
|
||||
active_session_file.write_text(json.dumps({"session_id": "existing"}))
|
||||
|
||||
with client.websocket_connect("/api/pty?attach=TOK1&channel=CHAT") as ws2:
|
||||
ws2.send_bytes(b"again")
|
||||
|
||||
assert pty_keepalive_harness == [["x", "fresh"]]
|
||||
Reference in New Issue
Block a user