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.
78 lines
3.3 KiB
Python
78 lines
3.3 KiB
Python
"""Regression: the Windows installer must not spawn a bare ``powershell``.
|
|
|
|
A user on Windows reported the installer getting stuck; running
|
|
``irm https://hermes-agent.nousresearch.com/install.ps1 | iex`` failed at the
|
|
uv step with::
|
|
|
|
[X] Failed to install uv: The term 'powershell' is not recognized as the
|
|
name of a cmdlet, function, script file, or operable program.
|
|
|
|
Root cause: ``Install-Uv`` spawned the astral uv installer via a hardcoded
|
|
bare ``powershell`` command. That name resolves only to *Windows PowerShell*
|
|
and only when its System32 directory is on ``PATH``. Under PowerShell 7+
|
|
(``pwsh``) -- or any session where ``powershell`` isn't on ``PATH`` -- the
|
|
spawn dies and uv installation aborts.
|
|
|
|
The fix resolves the PowerShell host executable (preferring the absolute path
|
|
of the running host, then ``powershell``/``pwsh`` via ``Get-Command``) and
|
|
invokes *that* instead of a bare name. These tests lock that contract at the
|
|
source level (the script only runs on Windows, so there's no runner to
|
|
execute it on Linux CI).
|
|
"""
|
|
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
_INSTALL_PS1 = Path(__file__).resolve().parents[3] / "scripts" / "install.ps1"
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
def source() -> str:
|
|
return _INSTALL_PS1.read_text(encoding="utf-8")
|
|
|
|
|
|
def test_astral_uv_installer_not_spawned_via_bare_powershell(source: str):
|
|
"""The exact failing literal must be gone."""
|
|
forbidden = 'powershell -ExecutionPolicy ByPass -c "irm https://astral.sh/uv'
|
|
assert forbidden not in source, (
|
|
"Install-Uv still spawns the astral uv installer via a bare "
|
|
"`powershell` — it must use the resolved PowerShell host exe so it "
|
|
"works under pwsh / when powershell isn't on PATH."
|
|
)
|
|
|
|
|
|
def test_astral_uv_installer_invoked_via_resolved_host_variable(source: str):
|
|
"""The astral uv installer line must use the call operator on a variable.
|
|
|
|
i.e. ``& $psHostExe -ExecutionPolicy ... irm https://astral.sh/uv...``
|
|
rather than naming a fixed executable.
|
|
"""
|
|
lines = [ln for ln in source.splitlines() if "astral.sh/uv/install.ps1 | iex" in ln]
|
|
# Exactly one invocation line carries the astral installer.
|
|
invocation = [ln for ln in lines if "irm https://astral.sh/uv/install.ps1 | iex" in ln]
|
|
assert invocation, "astral uv install invocation line not found"
|
|
for ln in invocation:
|
|
stripped = ln.strip()
|
|
assert stripped.startswith("& $"), (
|
|
f"astral uv installer must be invoked via the call operator on a "
|
|
f"resolved host variable (`& $...`), got: {stripped!r}"
|
|
)
|
|
|
|
|
|
def test_powershell_host_resolver_is_defined_and_portable(source: str):
|
|
"""A host-resolver helper must exist and be PATH-independent + pwsh-aware."""
|
|
assert "function Get-PowerShellHostExe" in source, (
|
|
"expected a Get-PowerShellHostExe helper that resolves the host exe"
|
|
)
|
|
# PATH-independent: derive the absolute path of the running host.
|
|
assert "Get-Process -Id $PID" in source, (
|
|
"resolver must derive the current host's absolute path "
|
|
"(Get-Process -Id $PID), which is independent of PATH"
|
|
)
|
|
# pwsh-aware fallback: PowerShell 7's executable is `pwsh`, not `powershell`.
|
|
assert "pwsh" in source, (
|
|
"resolver must fall back to pwsh (PowerShell 7) when powershell is "
|
|
"unavailable"
|
|
)
|