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.
98 lines
2.7 KiB
Python
98 lines
2.7 KiB
Python
"""Regression tests for parallel image-generation tool batches."""
|
|
|
|
import json
|
|
from types import SimpleNamespace
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import run_agent
|
|
from agent import tool_executor
|
|
|
|
|
|
def _tool_call(name: str, args: dict, call_id: str) -> SimpleNamespace:
|
|
return SimpleNamespace(
|
|
id=call_id,
|
|
function=SimpleNamespace(
|
|
name=name,
|
|
arguments=json.dumps(args),
|
|
),
|
|
)
|
|
|
|
|
|
def test_image_generate_batch_routes_to_concurrent_executor():
|
|
agent = SimpleNamespace()
|
|
agent._execute_tool_calls = run_agent.AIAgent._execute_tool_calls.__get__(agent)
|
|
agent._execute_tool_calls_concurrent = MagicMock()
|
|
agent._execute_tool_calls_sequential = MagicMock()
|
|
assistant_message = SimpleNamespace(
|
|
tool_calls=[
|
|
_tool_call("image_generate", {"prompt": "variation one"}, "img_1"),
|
|
_tool_call("image_generate", {"prompt": "variation two"}, "img_2"),
|
|
],
|
|
)
|
|
|
|
agent._execute_tool_calls(assistant_message, [], "task-image-batch")
|
|
|
|
agent._execute_tool_calls_concurrent.assert_called_once()
|
|
agent._execute_tool_calls_sequential.assert_not_called()
|
|
|
|
|
|
def test_image_generate_parallel_worker_cap_defaults_to_four():
|
|
runnable_calls = [
|
|
(
|
|
0,
|
|
_tool_call("image_generate", {"prompt": "one"}, "img_1"),
|
|
"image_generate",
|
|
{},
|
|
),
|
|
(
|
|
1,
|
|
_tool_call("image_generate", {"prompt": "two"}, "img_2"),
|
|
"image_generate",
|
|
{},
|
|
),
|
|
(
|
|
2,
|
|
_tool_call("image_generate", {"prompt": "three"}, "img_3"),
|
|
"image_generate",
|
|
{},
|
|
),
|
|
(
|
|
3,
|
|
_tool_call("image_generate", {"prompt": "four"}, "img_4"),
|
|
"image_generate",
|
|
{},
|
|
),
|
|
(
|
|
4,
|
|
_tool_call("image_generate", {"prompt": "five"}, "img_5"),
|
|
"image_generate",
|
|
{},
|
|
),
|
|
]
|
|
|
|
with patch("hermes_cli.config.load_config", return_value={}):
|
|
assert tool_executor._max_workers_for_tool_batch(runnable_calls) == 4
|
|
|
|
|
|
def test_image_generate_parallel_worker_cap_can_be_configured_lower():
|
|
runnable_calls = [
|
|
(
|
|
0,
|
|
_tool_call("image_generate", {"prompt": "one"}, "img_1"),
|
|
"image_generate",
|
|
{},
|
|
),
|
|
(
|
|
1,
|
|
_tool_call("image_generate", {"prompt": "two"}, "img_2"),
|
|
"image_generate",
|
|
{},
|
|
),
|
|
]
|
|
|
|
with patch(
|
|
"hermes_cli.config.load_config",
|
|
return_value={"image_gen": {"max_parallel_requests": 1}},
|
|
):
|
|
assert tool_executor._max_workers_for_tool_batch(runnable_calls) == 1
|