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.
136 lines
4.0 KiB
Python
136 lines
4.0 KiB
Python
"""Chat startup must explain a mixed-version ImportError (#96900).
|
|
|
|
A half-updated install can ship a newer ``cli.py`` that imports
|
|
``resolve_turn_limit`` / ``split_model_config_default`` from
|
|
``hermes_cli.config`` while the older ``config.py`` does not export them.
|
|
Construction of ``HermesCLI`` then dies before the agent-setup mixin can
|
|
print ``partial_update_hint``. ``cmd_chat`` is the load-bearing catch:
|
|
bare ``hermes`` and ``hermes chat`` (including the fast-chat launch path)
|
|
all go through it.
|
|
"""
|
|
|
|
from argparse import Namespace
|
|
import io
|
|
import sys
|
|
import types
|
|
|
|
import pytest
|
|
|
|
from hermes_constants import emit_partial_update_hint, partial_update_hint
|
|
|
|
|
|
def _chat_args(**overrides):
|
|
base = {
|
|
"continue_last": None,
|
|
"model": None,
|
|
"provider": None,
|
|
"resume": None,
|
|
"no_restore_cwd": False,
|
|
"toolsets": None,
|
|
"skills": None,
|
|
"tui": False,
|
|
"tui_dev": False,
|
|
"cli": True,
|
|
"verbose": None,
|
|
"quiet": True,
|
|
"query": "hello",
|
|
"image": None,
|
|
"worktree": False,
|
|
"checkpoints": False,
|
|
"pass_session_id": False,
|
|
"max_turns": None,
|
|
"ignore_rules": False,
|
|
"ignore_user_config": False,
|
|
"safe_mode": False,
|
|
"compact": False,
|
|
"source": None,
|
|
"yolo": False,
|
|
"accept_hooks": False,
|
|
}
|
|
base.update(overrides)
|
|
return Namespace(**base)
|
|
|
|
|
|
def _missing_config_name_error(name: str = "resolve_turn_limit") -> ImportError:
|
|
exc = ImportError(
|
|
f"cannot import name '{name}' from 'hermes_cli.config'"
|
|
)
|
|
exc.name = "hermes_cli.config"
|
|
return exc
|
|
|
|
|
|
@pytest.fixture
|
|
def main_mod(monkeypatch):
|
|
import hermes_cli.main as mod
|
|
|
|
monkeypatch.setattr(mod, "_has_any_provider_configured", lambda: True)
|
|
monkeypatch.setattr(mod, "_sync_bundled_skills_for_startup", lambda: None)
|
|
monkeypatch.setattr(mod, "_termux_should_prefetch_update_check", lambda: False)
|
|
monkeypatch.setattr(mod, "_pin_kanban_board_env", lambda: None)
|
|
monkeypatch.setattr(mod, "_resolve_session_by_name_or_id", lambda val: val)
|
|
return mod
|
|
|
|
|
|
def test_emit_hint_for_missing_resolve_turn_limit():
|
|
exc = _missing_config_name_error("resolve_turn_limit")
|
|
buf = io.StringIO()
|
|
|
|
assert emit_partial_update_hint(exc, file=buf) is True
|
|
text = buf.getvalue()
|
|
assert "resolve_turn_limit" in text
|
|
assert "hermes update" in text
|
|
assert "partially-updated" in text
|
|
|
|
|
|
def test_emit_hint_for_missing_split_model_config_default():
|
|
exc = _missing_config_name_error("split_model_config_default")
|
|
assert partial_update_hint(exc)
|
|
buf = io.StringIO()
|
|
assert emit_partial_update_hint(exc, file=buf) is True
|
|
assert "hermes update" in buf.getvalue()
|
|
|
|
|
|
def test_emit_hint_stays_silent_for_third_party_import_error():
|
|
exc = ImportError("cannot import name 'dumps' from 'requests'")
|
|
exc.name = "requests"
|
|
buf = io.StringIO()
|
|
assert emit_partial_update_hint(exc, file=buf) is False
|
|
assert buf.getvalue() == ""
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"name",
|
|
["resolve_turn_limit", "split_model_config_default"],
|
|
)
|
|
def test_cmd_chat_prints_update_hint_when_config_helper_is_missing(
|
|
main_mod, monkeypatch, capsys, name
|
|
):
|
|
def boom(**_kwargs):
|
|
raise _missing_config_name_error(name)
|
|
|
|
monkeypatch.setitem(sys.modules, "cli", types.SimpleNamespace(main=boom))
|
|
|
|
with pytest.raises(SystemExit) as excinfo:
|
|
main_mod.cmd_chat(_chat_args())
|
|
|
|
assert excinfo.value.code == 1
|
|
err = capsys.readouterr().err
|
|
assert name in err
|
|
assert "hermes update" in err
|
|
assert "partially-updated" in err
|
|
|
|
|
|
def test_cmd_chat_still_reraises_unrelated_import_errors(main_mod, monkeypatch):
|
|
exc = ImportError("cannot import name 'dumps' from 'requests'")
|
|
exc.name = "requests"
|
|
|
|
def boom(**_kwargs):
|
|
raise exc
|
|
|
|
monkeypatch.setitem(sys.modules, "cli", types.SimpleNamespace(main=boom))
|
|
|
|
with pytest.raises(ImportError) as excinfo:
|
|
main_mod.cmd_chat(_chat_args())
|
|
|
|
assert excinfo.value is exc
|