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.
81 lines
3.4 KiB
Python
81 lines
3.4 KiB
Python
"""Reproduction test for issue #63425: Provider auto-detection discards credential pools.
|
|
|
|
When AIAgent is constructed with provider=None and a recognized endpoint URL,
|
|
the provider auto-detection works but the credential pool is discarded because
|
|
pool validation runs before URL-based provider inference.
|
|
"""
|
|
from types import SimpleNamespace
|
|
from unittest.mock import patch, MagicMock
|
|
|
|
import pytest
|
|
|
|
|
|
def _mock_client(api_key="test-key", base_url="https://api.anthropic.com"):
|
|
c = MagicMock()
|
|
c.api_key = api_key
|
|
c.base_url = base_url
|
|
c._default_headers = None
|
|
return c
|
|
|
|
|
|
class TestCredentialPoolPreservedOnAutoDetect:
|
|
"""Issue #63425: credential pool should survive provider auto-detection."""
|
|
|
|
def test_anthropic_pool_preserved_with_url_auto_detect(self):
|
|
"""When provider=None and base_url=api.anthropic.com, the passed
|
|
credential_pool should remain attached after auto-detection."""
|
|
from agent.agent_init import init_agent
|
|
|
|
# Build a minimal agent-like object (like tests use object.__new__)
|
|
from run_agent import AIAgent
|
|
agent = object.__new__(AIAgent)
|
|
agent._base_url = ""
|
|
agent._base_url_lower = ""
|
|
agent._base_url_hostname = ""
|
|
|
|
pool = SimpleNamespace(provider="anthropic")
|
|
|
|
with patch("agent.auxiliary_client.resolve_provider_client", return_value=(None, None)), \
|
|
patch("model_tools.get_tool_definitions", return_value=[]), \
|
|
patch('agent.anthropic_adapter.build_anthropic_client', return_value=MagicMock()), \
|
|
patch('agent.anthropic_credentials.resolve_anthropic_token', return_value=''), \
|
|
patch('agent.anthropic_credentials._is_oauth_token', return_value=False), \
|
|
patch('agent.azure_identity_adapter.is_token_provider', return_value=False), \
|
|
patch('hermes_cli.model_normalize.normalize_model_for_provider', return_value='test-model'), \
|
|
patch('agent.credential_pool.load_pool', return_value=MagicMock()), \
|
|
patch('hermes_cli.config.load_config', return_value={}), \
|
|
patch('hermes_cli.config.get_compatible_custom_providers', return_value=[]), \
|
|
patch('agent.iteration_budget.IterationBudget'), \
|
|
patch('hermes_cli.config.cfg_get', return_value=None):
|
|
|
|
init_agent(
|
|
agent,
|
|
base_url="https://api.anthropic.com",
|
|
api_key="test-key",
|
|
provider=None,
|
|
model="test-model",
|
|
credential_pool=pool,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
quiet_mode=True,
|
|
)
|
|
|
|
print(f"agent.provider = {agent.provider!r}")
|
|
print(f"agent.api_mode = {agent.api_mode!r}")
|
|
print(f"agent._credential_pool is pool = {agent._credential_pool is pool}")
|
|
|
|
assert agent.provider == "anthropic", (
|
|
f"Provider should be auto-detected as 'anthropic', got {agent.provider!r}"
|
|
)
|
|
assert agent.api_mode == "anthropic_messages", (
|
|
f"api_mode should be 'anthropic_messages', got {agent.api_mode!r}"
|
|
)
|
|
assert agent._credential_pool is pool, (
|
|
"Credential pool was discarded! agent._credential_pool is NOT the "
|
|
"same object that was passed to AIAgent().\n"
|
|
f" Expected: {id(pool)}\n"
|
|
f" Got: {id(agent._credential_pool)}"
|
|
)
|
|
|
|
|