teknium1
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.
100 lines
3.4 KiB
Python
100 lines
3.4 KiB
Python
"""Tests for CLI/TUI CWD resolution in load_cli_config().
|
|
|
|
Rules:
|
|
- Local backend CLI/TUI: always os.getcwd(), ignoring config and inherited env.
|
|
- Non-local with placeholder: pop cwd for backend default.
|
|
- Non-local with explicit path: keep as-is.
|
|
"""
|
|
|
|
|
|
_CWD_PLACEHOLDERS = (".", "auto", "cwd")
|
|
|
|
|
|
def _resolve_cwd(terminal_config: dict, defaults: dict, env: dict):
|
|
"""Mirror the CWD resolution logic from cli.py load_cli_config()."""
|
|
effective_backend = terminal_config.get("env_type", "local")
|
|
|
|
if effective_backend == "local":
|
|
terminal_config["cwd"] = "/fake/getcwd"
|
|
defaults["terminal"]["cwd"] = terminal_config["cwd"]
|
|
elif terminal_config.get("cwd") in _CWD_PLACEHOLDERS:
|
|
terminal_config.pop("cwd", None)
|
|
|
|
# Bridge: TERMINAL_CWD always exported in CLI, skipped in gateway
|
|
_is_gateway = env.get("_HERMES_GATEWAY") == "1"
|
|
if "cwd" in terminal_config:
|
|
if _is_gateway:
|
|
pass # don't touch env
|
|
else:
|
|
env["TERMINAL_CWD"] = str(terminal_config["cwd"])
|
|
|
|
return env.get("TERMINAL_CWD", "")
|
|
|
|
|
|
class TestLocalBackendCli:
|
|
"""Local backend always uses os.getcwd()."""
|
|
|
|
def test_explicit_config_ignored(self):
|
|
env = {}
|
|
tc = {"cwd": "/explicit/path", "env_type": "local"}
|
|
d = {"terminal": {"cwd": "/explicit/path"}}
|
|
assert _resolve_cwd(tc, d, env) == "/fake/getcwd"
|
|
|
|
def test_inherited_env_overwritten(self):
|
|
env = {"TERMINAL_CWD": "/parent/hermes"}
|
|
tc = {"cwd": "/home/user", "env_type": "local"}
|
|
d = {"terminal": {"cwd": "/home/user"}}
|
|
assert _resolve_cwd(tc, d, env) == "/fake/getcwd"
|
|
|
|
def test_placeholder_resolved(self):
|
|
env = {}
|
|
tc = {"cwd": "."}
|
|
d = {"terminal": {"cwd": "."}}
|
|
assert _resolve_cwd(tc, d, env) == "/fake/getcwd"
|
|
|
|
def test_env_and_no_config_file(self):
|
|
env = {"TERMINAL_CWD": "/stale/value"}
|
|
tc = {"cwd": ".", "env_type": "local"}
|
|
d = {"terminal": {"cwd": "."}}
|
|
assert _resolve_cwd(tc, d, env) == "/fake/getcwd"
|
|
|
|
|
|
class TestNonLocalBackends:
|
|
"""Non-local backends use config or per-backend defaults."""
|
|
|
|
def test_placeholder_popped(self):
|
|
env = {}
|
|
tc = {"cwd": ".", "env_type": "docker"}
|
|
d = {"terminal": {"cwd": "."}}
|
|
assert _resolve_cwd(tc, d, env) == ""
|
|
|
|
def test_explicit_path_kept(self):
|
|
env = {}
|
|
tc = {"cwd": "/srv/app", "env_type": "ssh"}
|
|
d = {"terminal": {"cwd": "/srv/app"}}
|
|
assert _resolve_cwd(tc, d, env) == "/srv/app"
|
|
|
|
def test_auto_placeholder_popped(self):
|
|
env = {}
|
|
tc = {"cwd": "auto", "env_type": "modal"}
|
|
d = {"terminal": {"cwd": "auto"}}
|
|
assert _resolve_cwd(tc, d, env) == ""
|
|
|
|
|
|
class TestGatewayLazyImport:
|
|
"""Gateway lazy import of cli.py must not clobber TERMINAL_CWD."""
|
|
|
|
def test_gateway_cwd_preserved(self):
|
|
env = {"_HERMES_GATEWAY": "1", "TERMINAL_CWD": "/home/user/project"}
|
|
tc = {"cwd": "/home/user", "env_type": "local"}
|
|
d = {"terminal": {"cwd": "/home/user"}}
|
|
result = _resolve_cwd(tc, d, env)
|
|
assert result == "/home/user/project"
|
|
|
|
def test_cli_overwrites_stale_env(self):
|
|
env = {"TERMINAL_CWD": "/stale/from/dotenv"}
|
|
tc = {"cwd": "/home/user", "env_type": "local"}
|
|
d = {"terminal": {"cwd": "/home/user"}}
|
|
result = _resolve_cwd(tc, d, env)
|
|
assert result == "/fake/getcwd"
|