d10bb2ab6f
`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.
120 lines
4.3 KiB
Python
120 lines
4.3 KiB
Python
"""Tests for empty-session hygiene — gemini-cli#27770 port.
|
|
|
|
Starting the CLI and immediately quitting (or rotating sessions with /new)
|
|
used to leave empty untitled rows in the session DB that clutter /resume
|
|
and `hermes sessions list`. ``SessionDB.delete_session_if_empty`` removes
|
|
a just-ended session row only when it never gained resumable content:
|
|
no messages, no title, and no child sessions.
|
|
"""
|
|
|
|
import pytest
|
|
|
|
from hermes_state import SessionDB
|
|
|
|
|
|
@pytest.fixture()
|
|
def db(tmp_path):
|
|
session_db = SessionDB(db_path=tmp_path / "state.db")
|
|
yield session_db
|
|
session_db.close()
|
|
|
|
|
|
class TestDeleteSessionIfEmpty:
|
|
|
|
def test_keeps_session_with_messages(self, db):
|
|
db.create_session(session_id="busy", source="cli", model="test")
|
|
db.append_message("busy", role="user", content="hello")
|
|
db.end_session("busy", "cli_close")
|
|
|
|
assert db.delete_session_if_empty("busy") is False
|
|
assert db.get_session("busy") is not None
|
|
|
|
def test_keeps_titled_session(self, db):
|
|
"""A user-assigned title is resumable content even without messages."""
|
|
db.create_session(session_id="titled", source="cli", model="test")
|
|
db.set_session_title("titled", "Important plans")
|
|
db.end_session("titled", "cli_close")
|
|
|
|
assert db.delete_session_if_empty("titled") is False
|
|
assert db.get_session("titled") is not None
|
|
|
|
def test_keeps_session_with_children(self, db):
|
|
"""A parent that spawned delegate subagent runs is not empty."""
|
|
db.create_session(session_id="parent", source="cli", model="test")
|
|
db.create_session(
|
|
session_id="child",
|
|
source="tool",
|
|
model="test",
|
|
parent_session_id="parent",
|
|
)
|
|
db.end_session("parent", "cli_close")
|
|
|
|
assert db.delete_session_if_empty("parent") is False
|
|
assert db.get_session("parent") is not None
|
|
assert db.get_session("child") is not None
|
|
|
|
|
|
def test_removes_on_disk_transcripts(self, db, tmp_path):
|
|
sessions_dir = tmp_path / "sessions"
|
|
sessions_dir.mkdir()
|
|
(sessions_dir / "empty.json").write_text("{}", encoding="utf-8")
|
|
(sessions_dir / "empty.jsonl").write_text("", encoding="utf-8")
|
|
|
|
db.create_session(session_id="empty", source="cli", model="test")
|
|
db.end_session("empty", "cli_close")
|
|
|
|
assert db.delete_session_if_empty("empty", sessions_dir=sessions_dir)
|
|
assert not (sessions_dir / "empty.json").exists()
|
|
assert not (sessions_dir / "empty.jsonl").exists()
|
|
|
|
def test_no_file_cleanup_when_kept(self, db, tmp_path):
|
|
sessions_dir = tmp_path / "sessions"
|
|
sessions_dir.mkdir()
|
|
(sessions_dir / "busy.json").write_text("{}", encoding="utf-8")
|
|
|
|
db.create_session(session_id="busy", source="cli", model="test")
|
|
db.append_message("busy", role="user", content="hello")
|
|
|
|
assert not db.delete_session_if_empty("busy", sessions_dir=sessions_dir)
|
|
assert (sessions_dir / "busy.json").exists()
|
|
|
|
|
|
|
|
class TestCLIDiscardSessionIfEmpty:
|
|
"""Wiring tests for HermesCLI._discard_session_if_empty."""
|
|
|
|
def _make_cli(self, db):
|
|
from cli import HermesCLI
|
|
|
|
cli = HermesCLI.__new__(HermesCLI)
|
|
cli._session_db = db
|
|
cli.conversation_history = []
|
|
return cli
|
|
|
|
|
|
|
|
|
|
def test_none_session_id_is_noop(self, db):
|
|
cli = self._make_cli(db)
|
|
assert cli._discard_session_if_empty(None) is False
|
|
|
|
def test_db_error_swallowed(self, db):
|
|
class Boom:
|
|
def delete_session_if_empty(self, *a, **k):
|
|
raise RuntimeError("locked")
|
|
|
|
cli = self._make_cli(Boom())
|
|
assert cli._discard_session_if_empty("x") is False
|
|
|
|
def test_in_memory_history_blocks_prune(self, db):
|
|
"""The live transcript is authoritative: even if the DB row has no
|
|
flushed messages yet, a CLI holding conversation history must not
|
|
prune the session (covers flush-failed / not-yet-flushed turns)."""
|
|
db.create_session(session_id="unflushed", source="cli", model="test")
|
|
db.end_session("unflushed", "new_session")
|
|
|
|
cli = self._make_cli(db)
|
|
cli.conversation_history = [{"role": "user", "content": "hello"}]
|
|
assert cli._discard_session_if_empty("unflushed") is False
|
|
assert db.get_session("unflushed") is not None
|