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.
105 lines
3.4 KiB
Python
105 lines
3.4 KiB
Python
"""Tests for toolset_distributions.py — distribution CRUD, sampling, validation."""
|
|
|
|
import pytest
|
|
|
|
from toolset_distributions import (
|
|
DISTRIBUTIONS,
|
|
get_distribution,
|
|
list_distributions,
|
|
sample_toolsets_from_distribution,
|
|
validate_distribution,
|
|
)
|
|
|
|
|
|
class TestGetDistribution:
|
|
def test_known_distribution(self):
|
|
dist = get_distribution("default")
|
|
assert dist is not None
|
|
assert "description" in dist
|
|
assert "toolsets" in dist
|
|
|
|
|
|
|
|
|
|
class TestListDistributions:
|
|
def test_returns_copy(self):
|
|
d1 = list_distributions()
|
|
d2 = list_distributions()
|
|
assert d1 is not d2
|
|
assert d1 == d2
|
|
|
|
|
|
|
|
class TestValidateDistribution:
|
|
def test_valid(self):
|
|
assert validate_distribution("default") is True
|
|
assert validate_distribution("research") is True
|
|
|
|
|
|
|
|
class TestSampleToolsetsFromDistribution:
|
|
|
|
|
|
def test_minimal_returns_web_only(self):
|
|
result = sample_toolsets_from_distribution("minimal")
|
|
assert "web" in result
|
|
|
|
def test_returns_list_of_strings(self):
|
|
result = sample_toolsets_from_distribution("balanced")
|
|
assert isinstance(result, list)
|
|
for item in result:
|
|
assert isinstance(item, str)
|
|
|
|
|
|
|
|
class TestDistributionStructure:
|
|
def test_all_have_required_keys(self):
|
|
for name, dist in DISTRIBUTIONS.items():
|
|
assert "description" in dist, f"{name} missing description"
|
|
assert "toolsets" in dist, f"{name} missing toolsets"
|
|
assert isinstance(dist["toolsets"], dict), f"{name} toolsets not a dict"
|
|
|
|
def test_probabilities_are_valid_range(self):
|
|
for name, dist in DISTRIBUTIONS.items():
|
|
for ts_name, prob in dist["toolsets"].items():
|
|
assert 0 < prob <= 100, f"{name}.{ts_name} has invalid probability {prob}"
|
|
|
|
|
|
class TestGroupedCompoundEntries:
|
|
""""+"-grouped entries roll once and select all members together (#64503)."""
|
|
|
|
def test_hit_roll_selects_all_members_together(self, monkeypatch):
|
|
import toolset_distributions as td
|
|
|
|
monkeypatch.setattr(td.random, "random", lambda: 0.0) # every roll hits
|
|
result = sample_toolsets_from_distribution("browser_tasks")
|
|
assert "browser" in result
|
|
assert "search" in result
|
|
assert "browser+search" not in result # members, not the raw key
|
|
|
|
def test_fallback_expands_compound_members(self, monkeypatch):
|
|
import toolset_distributions as td
|
|
|
|
monkeypatch.setitem(
|
|
td.DISTRIBUTIONS,
|
|
"_test_compound_fallback",
|
|
{"description": "t", "toolsets": {"browser+search": 60, "web": 10}},
|
|
)
|
|
monkeypatch.setattr(td.random, "random", lambda: 1.0) # every roll misses
|
|
result = sample_toolsets_from_distribution("_test_compound_fallback")
|
|
assert set(result) == {"browser", "search"}
|
|
|
|
def test_invalid_member_skips_whole_entry(self, monkeypatch, capsys):
|
|
import toolset_distributions as td
|
|
|
|
monkeypatch.setitem(
|
|
td.DISTRIBUTIONS,
|
|
"_test_compound_invalid",
|
|
{"description": "t", "toolsets": {"browser+__not_a_toolset__": 100, "web": 100}},
|
|
)
|
|
monkeypatch.setattr(td.random, "random", lambda: 0.0)
|
|
result = sample_toolsets_from_distribution("_test_compound_invalid")
|
|
assert "browser" not in result # invalid member disqualifies the group
|
|
assert "web" in result
|
|
assert "not valid" in capsys.readouterr().out
|