Teknium
39975613b1
Second, deeper pass over tools/gateway/hermes_cli plus first pass over the trees wave 1 missed (acp, acp_adapter, skills, computer_use, docker, dashboard, conformance, monitoring, secret_sources, hermes_state, providers). Same rubric as wave 1 (AGENTS.md test policy); security, alternation/caching invariants, issue-number regressions, and E2E kept. Real test-quality fixes found and rooted out along the way: - tests/tools/test_command_guards.py made real auxiliary-LLM HTTPS calls (DEFAULT_CONFIG smart-approval leaked in) — pinned approval mode=manual via autouse fixture: 17.4s → 0.4s. - test_model_switch_custom_providers.py / test_user_providers_model_switch.py silently probed live provider catalogs (~2s/test) — stubbed cached_provider_model_ids/provider_model_ids/fetch_api_models. - test_telegram_noise_filter.py: 15-platform copy-paste matrix over shared gateway.run logic → 3 representative platforms (55s → 3.9s). - test_gateway_shutdown.py: stop()'s 5s interrupt-deadline loop spun on MagicMock agents — interrupt.side_effect now clears _running_agents (22s → 1.0s). - test_gateway_inactivity_timeout.py poll-harness timings shrunk 3-5x (24s → 1.1s); test_mcp_stability.py backoff/SIGTERM-grace sleeps patched (15.4s → 2.5s); test_async_delegation.py negative-drain wait 5s → 0.5s. - test_telegram_init_deadline.py: loop-block margin restored to 1.0s with rationale comment — the watchdog-dump assertion needs the loop blocked well past deadline+grace under parallel load (flaked once in the 40-worker verification run at a 0.2s margin). Verification: full hermetic suite via scripts/run_tests.sh — 2,438 files, 21,718 tests passed, 0 failed, 293.9s wall. Suite totals vs original baseline: 46,820 → 19,757 test functions (−57.8%), wall 583.5s → 293.9s (−50%), subprocess CPU 13,564s → 11,623s.
67 lines
2.2 KiB
Python
67 lines
2.2 KiB
Python
"""Regression tests for ACP adapter detection under Azure Foundry Entra ID.
|
|
|
|
The ACP adapter's ``detect_provider`` previously gated on
|
|
``isinstance(api_key, str)`` and returned ``None`` for any runtime that
|
|
returned a callable ``api_key`` — i.e. Azure Foundry with
|
|
``auth_mode=entra_id``. Downstream, ACP would default to
|
|
``"openrouter"`` and reject the legitimate provider in its auth handshake.
|
|
This test pins the callable-aware fix so it never regresses.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from unittest.mock import patch
|
|
|
|
|
|
class TestDetectProviderEntra:
|
|
def test_callable_api_key_is_a_valid_credential(self):
|
|
"""A runtime returning a callable ``api_key`` (Entra bearer token
|
|
provider) must be detected as a configured provider, not
|
|
``None``."""
|
|
from acp_adapter import auth as _acp_auth
|
|
|
|
def _fake_runtime(**_kwargs):
|
|
return {
|
|
"provider": "azure-foundry",
|
|
"api_mode": "chat_completions",
|
|
"auth_mode": "entra_id",
|
|
"base_url": "https://r.openai.azure.com/openai/v1",
|
|
"api_key": lambda: "jwt-fresh",
|
|
}
|
|
|
|
with patch(
|
|
"hermes_cli.runtime_provider.resolve_runtime_provider",
|
|
side_effect=_fake_runtime,
|
|
):
|
|
assert _acp_auth.detect_provider() == "azure-foundry"
|
|
assert _acp_auth.has_provider() is True
|
|
|
|
def test_string_api_key_still_works(self):
|
|
from acp_adapter import auth as _acp_auth
|
|
|
|
def _fake_runtime(**_kwargs):
|
|
return {
|
|
"provider": "openrouter",
|
|
"api_key": "sk-or-static-key",
|
|
}
|
|
|
|
with patch(
|
|
"hermes_cli.runtime_provider.resolve_runtime_provider",
|
|
side_effect=_fake_runtime,
|
|
):
|
|
assert _acp_auth.detect_provider() == "openrouter"
|
|
|
|
def test_empty_string_api_key_returns_none(self):
|
|
from acp_adapter import auth as _acp_auth
|
|
|
|
def _fake_runtime(**_kwargs):
|
|
return {"provider": "openrouter", "api_key": ""}
|
|
|
|
with patch(
|
|
"hermes_cli.runtime_provider.resolve_runtime_provider",
|
|
side_effect=_fake_runtime,
|
|
):
|
|
assert _acp_auth.detect_provider() is None
|
|
|
|
|