mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-21 03:39:54 +00:00
kshitij
5fba236644
Six days after #23937 (608 fixes) the codebase had accumulated 241 new PLR6201 violations. Same mechanical `x in (...)` → `x in {...}` fix, same zero-risk profile: set lookup is O(1) vs O(n) for tuple and the two are semantically equivalent for hashable scalar membership tests. All 241 instances fixed via `ruff check --select PLR6201 --fix --unsafe-fixes`, zero remaining. Every changed value is a hashable scalar (str/int/None/enum/signal); no risk of unhashable runtime errors. No behavior change. Test plan: - 119 files changed, +244/-244 (net zero) — exactly one-line edits - `ruff check` clean afterward - Compile checks pass on the largest touched files (cli.py, run_agent.py, gateway/run.py, gateway/platforms/discord.py, model_tools.py) - Subset broad test run on tests/gateway/ tests/hermes_cli/ tests/agent/ tests/tools/: 18187 passed, 59 pre-existing failures (verified against origin/main with the same shape — identical failure count, identical category — all xdist test-order flakes unrelated to this change) Follows the same template as PR #23937 ([tracker: #23972](https://github.com/NousResearch/hermes-agent/issues/23972)).
78 lines
3.2 KiB
Python
78 lines
3.2 KiB
Python
"""Tests for Singularity/Apptainer preflight availability check.
|
|
|
|
Verifies that a clear error is raised when neither apptainer nor
|
|
singularity is installed, instead of a cryptic FileNotFoundError.
|
|
|
|
See: https://github.com/NousResearch/hermes-agent/issues/1511
|
|
"""
|
|
|
|
import subprocess
|
|
from unittest.mock import patch, MagicMock
|
|
|
|
import pytest
|
|
|
|
from tools.environments.singularity import (
|
|
_find_singularity_executable,
|
|
_ensure_singularity_available,
|
|
)
|
|
|
|
|
|
class TestFindSingularityExecutable:
|
|
"""_find_singularity_executable resolution tests."""
|
|
|
|
def test_prefers_apptainer(self):
|
|
"""When both are available, apptainer should be preferred."""
|
|
def which_both(name):
|
|
return f"/usr/bin/{name}" if name in {"apptainer", "singularity"} else None
|
|
|
|
with patch("shutil.which", side_effect=which_both):
|
|
assert _find_singularity_executable() == "apptainer"
|
|
|
|
def test_falls_back_to_singularity(self):
|
|
"""When only singularity is available, use it."""
|
|
def which_singularity_only(name):
|
|
return "/usr/bin/singularity" if name == "singularity" else None
|
|
|
|
with patch("shutil.which", side_effect=which_singularity_only):
|
|
assert _find_singularity_executable() == "singularity"
|
|
|
|
def test_raises_when_neither_found(self):
|
|
"""Must raise RuntimeError with install instructions."""
|
|
with patch("shutil.which", return_value=None):
|
|
with pytest.raises(RuntimeError, match="Neither.*apptainer.*nor.*singularity"):
|
|
_find_singularity_executable()
|
|
|
|
|
|
class TestEnsureSingularityAvailable:
|
|
"""_ensure_singularity_available preflight tests."""
|
|
|
|
def test_returns_executable_on_success(self):
|
|
"""Returns the executable name when version check passes."""
|
|
fake_result = MagicMock(returncode=0, stderr="")
|
|
|
|
with patch("shutil.which", side_effect=lambda n: "/usr/bin/apptainer" if n == "apptainer" else None), \
|
|
patch("subprocess.run", return_value=fake_result):
|
|
assert _ensure_singularity_available() == "apptainer"
|
|
|
|
def test_raises_on_version_failure(self):
|
|
"""Raises RuntimeError when version command fails."""
|
|
fake_result = MagicMock(returncode=1, stderr="unknown flag")
|
|
|
|
with patch("shutil.which", side_effect=lambda n: "/usr/bin/apptainer" if n == "apptainer" else None), \
|
|
patch("subprocess.run", return_value=fake_result):
|
|
with pytest.raises(RuntimeError, match="version.*failed"):
|
|
_ensure_singularity_available()
|
|
|
|
def test_raises_on_timeout(self):
|
|
"""Raises RuntimeError when version command times out."""
|
|
with patch("shutil.which", side_effect=lambda n: "/usr/bin/apptainer" if n == "apptainer" else None), \
|
|
patch("subprocess.run", side_effect=subprocess.TimeoutExpired("apptainer", 10)):
|
|
with pytest.raises(RuntimeError, match="timed out"):
|
|
_ensure_singularity_available()
|
|
|
|
def test_raises_when_not_installed(self):
|
|
"""Raises RuntimeError when neither executable exists."""
|
|
with patch("shutil.which", return_value=None):
|
|
with pytest.raises(RuntimeError, match="Neither.*apptainer.*nor.*singularity"):
|
|
_ensure_singularity_available()
|