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.
75 lines
2.0 KiB
Python
75 lines
2.0 KiB
Python
"""Native regression coverage for the Windows Desktop handoff cwd."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import shutil
|
|
import subprocess
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
|
|
pytestmark = pytest.mark.windows_only
|
|
|
|
REPO_ROOT = Path(__file__).resolve().parent.parent.parent.parent
|
|
WINDOWS_UPDATE_PS1 = REPO_ROOT / "scripts" / "desktop-update" / "windows.ps1"
|
|
|
|
|
|
def _run_cwd_self_test(
|
|
install_root: Path,
|
|
launch_cwd: Path,
|
|
temp_dir: Path,
|
|
) -> subprocess.CompletedProcess[str]:
|
|
powershell = shutil.which("powershell.exe")
|
|
assert powershell, "Windows updater tests require Windows PowerShell."
|
|
temp_dir.mkdir(parents=True, exist_ok=True)
|
|
env = os.environ.copy()
|
|
env["TEMP"] = str(temp_dir)
|
|
env["TMP"] = str(temp_dir)
|
|
return subprocess.run(
|
|
[
|
|
powershell,
|
|
"-NoProfile",
|
|
"-ExecutionPolicy",
|
|
"Bypass",
|
|
"-File",
|
|
str(WINDOWS_UPDATE_PS1),
|
|
"-InstallRoot",
|
|
str(install_root),
|
|
"-SelfTestWorkingDirectory",
|
|
"-NoUi",
|
|
],
|
|
cwd=launch_cwd,
|
|
env=env,
|
|
text=True,
|
|
errors="replace",
|
|
stdout=subprocess.PIPE,
|
|
stderr=subprocess.STDOUT,
|
|
timeout=60,
|
|
check=False,
|
|
)
|
|
|
|
|
|
def test_handoff_children_run_from_install_root(tmp_path: Path) -> None:
|
|
install_root = tmp_path / "checkout"
|
|
launch_cwd = tmp_path / "profile-home"
|
|
install_root.mkdir()
|
|
launch_cwd.mkdir()
|
|
|
|
result = _run_cwd_self_test(install_root, launch_cwd, tmp_path / "temp")
|
|
|
|
assert result.returncode == 0, result.stdout
|
|
assert "WORKING-DIRECTORY SELF-TEST: PASS" in result.stdout
|
|
|
|
|
|
def test_handoff_fails_closed_when_install_root_cannot_be_entered(tmp_path: Path) -> None:
|
|
install_root = tmp_path / "missing" / "checkout"
|
|
launch_cwd = tmp_path / "profile-home"
|
|
launch_cwd.mkdir()
|
|
|
|
result = _run_cwd_self_test(install_root, launch_cwd, tmp_path / "temp")
|
|
|
|
assert result.returncode == 3, result.stdout
|
|
assert "cannot enter the install root" in result.stdout
|