mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-31 19:16:29 +00:00
6b81590c55
Systematic prune per AGENTS.md test policy, one pass over every major test tree (gateway, hermes_cli, tools, agent, run_agent, plugins, cli, cron, tui_gateway, honcho/openviking, root-level): - DELETE: source-reading tests (read_text/getsource on prod files), change-detector tests (exact catalog counts, model-name snapshots, config version literals), mock-echo tests (assert a mock returns what it was told), assertion-free/trivial tests, near-duplicate parametrizations (boundaries + one representative kept), async/sync twin duplicates, cosmetic within-file variations. - KEEP (mandatory): security/redaction/approval guards, message-role alternation invariants, prompt-caching/deterministic-call-id invariants, issue-number regression tests (deduped), E2E tests. - 6 test files deleted outright (script-style/no-assert or fully redundant); conftest.py, fakes/, fixtures/ untouched. - tests/acp/conftest.py added: autouse fixture stubs the live models.dev/GitHub/Copilot/Anthropic inventory fetches that ACP server tests performed on every session create — test_server.py 147s → 3.4s, and the tests are now genuinely hermetic. - Sleep-based slowness shrunk where safe (codex_ttfb_watchdog, compression_concurrent_fork, etc.); no wall-clock assertion tightened. Verification: full hermetic suite via scripts/run_tests.sh — 2439 files, 31,130 tests passed, 0 failed, 0 flaky retries, 315s wall (baseline: 583s wall, 13,564s subprocess CPU).
92 lines
4 KiB
Python
92 lines
4 KiB
Python
"""Regression tests for #29285 — provider precedence in resolve_provider("auto").
|
|
|
|
Explicit user intent (config.yaml model.provider, env-var API keys) must win
|
|
over a stale logged-in OAuth `active_provider` in auth.json. Before the fix,
|
|
`active_provider` sat above the env/config checks and silently overrode an
|
|
explicit choice — e.g. a user OAuth-logged-into Anthropic but with
|
|
OPENAI_API_KEY exported (or model.provider set) got routed to Anthropic.
|
|
"""
|
|
import pytest
|
|
|
|
from hermes_cli.auth import resolve_provider, AuthError
|
|
|
|
|
|
def _login(monkeypatch, provider_id):
|
|
"""Simulate a logged-in OAuth active_provider in auth.json."""
|
|
monkeypatch.setattr("hermes_cli.auth._load_auth_store",
|
|
lambda: {"active_provider": provider_id})
|
|
monkeypatch.setattr("hermes_cli.auth.get_auth_status",
|
|
lambda p: {"logged_in": p == provider_id})
|
|
|
|
|
|
def _config(monkeypatch, model_cfg):
|
|
monkeypatch.setattr("hermes_cli.config.load_config", lambda: {"model": model_cfg})
|
|
|
|
|
|
def _no_aws(monkeypatch):
|
|
# Neutralize any ambient AWS creds so Bedrock auto-detect can't interfere.
|
|
monkeypatch.setattr("agent.bedrock_adapter.has_aws_credentials", lambda: False)
|
|
|
|
|
|
def _clear_provider_env(monkeypatch):
|
|
for var in ("OPENAI_API_KEY", "OPENROUTER_API_KEY", "GLM_API_KEY", "ZAI_API_KEY",
|
|
"KIMI_API_KEY", "MINIMAX_API_KEY", "HERMES_INFERENCE_PROVIDER"):
|
|
monkeypatch.delenv(var, raising=False)
|
|
|
|
|
|
class TestProviderPrecedence:
|
|
def test_config_provider_beats_stale_oauth(self, monkeypatch):
|
|
"""config.yaml model.provider wins over a logged-in OAuth active_provider."""
|
|
_clear_provider_env(monkeypatch)
|
|
_no_aws(monkeypatch)
|
|
_login(monkeypatch, "anthropic") # stale OAuth login
|
|
_config(monkeypatch, {"provider": "zai", "default": "glm-4.6"})
|
|
assert resolve_provider("auto") == "zai"
|
|
|
|
def test_env_key_beats_stale_oauth(self, monkeypatch):
|
|
"""An exported provider API key wins over a logged-in OAuth active_provider."""
|
|
_clear_provider_env(monkeypatch)
|
|
_no_aws(monkeypatch)
|
|
_login(monkeypatch, "anthropic")
|
|
_config(monkeypatch, {"default": "some-model"}) # dict, NO provider key
|
|
monkeypatch.setenv("OPENAI_API_KEY", "sk-test-key")
|
|
assert resolve_provider("auto") == "openrouter"
|
|
|
|
|
|
def test_oauth_used_as_last_resort(self, monkeypatch):
|
|
"""With NO config provider and NO env keys, the logged-in OAuth provider
|
|
is still used (it's the last-resort fallback, not removed)."""
|
|
_clear_provider_env(monkeypatch)
|
|
_no_aws(monkeypatch)
|
|
_login(monkeypatch, "anthropic")
|
|
_config(monkeypatch, {}) # empty model config, no provider
|
|
assert resolve_provider("auto") == "anthropic"
|
|
|
|
|
|
def test_warns_on_silent_oauth_fallthrough(self, monkeypatch, caplog):
|
|
"""A populated model dict lacking `provider` that falls through to OAuth
|
|
emits a WARN so the silent override is visible (#29285)."""
|
|
import logging
|
|
_clear_provider_env(monkeypatch)
|
|
_no_aws(monkeypatch)
|
|
_login(monkeypatch, "anthropic")
|
|
_config(monkeypatch, {"default": "claude-x"}) # populated, no provider
|
|
with caplog.at_level(logging.WARNING, logger="hermes_cli.auth"):
|
|
assert resolve_provider("auto") == "anthropic"
|
|
assert any("no `provider` key" in r.message for r in caplog.records)
|
|
|
|
|
|
def test_openrouter_pool_beats_stale_oauth(self, monkeypatch):
|
|
"""An OpenRouter credential-pool entry (no env var) wins over a logged-in
|
|
OAuth provider — the pool rung sits above OAuth (#42130 + #29285)."""
|
|
_clear_provider_env(monkeypatch)
|
|
_no_aws(monkeypatch)
|
|
_login(monkeypatch, "anthropic")
|
|
_config(monkeypatch, {})
|
|
|
|
class _Pool:
|
|
def has_credentials(self):
|
|
return True
|
|
|
|
monkeypatch.setattr("agent.credential_pool.load_pool", lambda name: _Pool())
|
|
assert resolve_provider("auto") == "openrouter"
|