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.
43 lines
1.6 KiB
Python
43 lines
1.6 KiB
Python
"""Regression tests for install.sh Node/npm checks (#77003).
|
|
|
|
A stray `node` symlink without a sibling `npm` (leftover from a node
|
|
version manager) made the installer report "✓ Node.js found" and then fail
|
|
opaquely at the desktop stage. Node must only count as found when npm
|
|
resolves on the same PATH, and npm install stages must not report success
|
|
when the install actually failed.
|
|
"""
|
|
|
|
from pathlib import Path
|
|
|
|
REPO_ROOT = Path(__file__).resolve().parent.parent.parent.parent
|
|
INSTALL_SH = REPO_ROOT / "scripts" / "install.sh"
|
|
|
|
|
|
def test_check_node_requires_npm_alongside_node() -> None:
|
|
"""check_node must not report success when only `node` resolves.
|
|
|
|
Before the fix, `command -v node` succeeding was enough — a stray node
|
|
symlink (no sibling npm) passed the check, every later `npm install`
|
|
failed silently, and the desktop build died with an opaque
|
|
"Node.js / npm unavailable" (#77003).
|
|
"""
|
|
text = INSTALL_SH.read_text()
|
|
|
|
# The system-toolchain branch now gates on BOTH node and npm.
|
|
assert (
|
|
"if command -v node &> /dev/null && command -v npm &> /dev/null \\" in text
|
|
)
|
|
# The "node found but npm missing" case has its own explicit branch that
|
|
# falls through to installing the Hermes-managed Node (which bundles npm).
|
|
assert "node found but npm is not on PATH (stray node symlink?)" in text
|
|
|
|
|
|
def test_check_node_managed_requires_npm() -> None:
|
|
"""The Hermes-managed Node fallback also requires its npm to exist."""
|
|
text = INSTALL_SH.read_text()
|
|
assert (
|
|
'[ -x "$HERMES_HOME/node/bin/node" ] && [ -x "$HERMES_HOME/node/bin/npm" ] \\'
|
|
in text
|
|
)
|
|
|