mirror of
https://github.com/BerriAI/litellm.git
synced 2026-09-10 22:41:41 +00:00
fix(mcp): align token_url suppression with warning condition; use patch.object in all tests
This commit is contained in:
parent
5346202689
commit
e70ad1b980
2 changed files with 5 additions and 6 deletions
|
|
@ -312,9 +312,9 @@ class MCPServerManager:
|
|||
server_id,
|
||||
_discovered_token_url,
|
||||
)
|
||||
resolved_token_url = _explicit_token_url or (
|
||||
_discovered_token_url if not _has_client_creds else None
|
||||
)
|
||||
resolved_token_url = None
|
||||
else:
|
||||
resolved_token_url = _explicit_token_url or _discovered_token_url
|
||||
resolved_registration_url = server_config.get("registration_url") or (
|
||||
mcp_oauth_metadata.registration_url if mcp_oauth_metadata else None
|
||||
)
|
||||
|
|
|
|||
|
|
@ -762,8 +762,6 @@ class TestMCPServerManager:
|
|||
assert server_url == "https://example.com/mcp"
|
||||
return discovered_metadata
|
||||
|
||||
manager._descovery_metadata = fake_discovery # type: ignore[attr-defined]
|
||||
|
||||
config = {
|
||||
"example": {
|
||||
"url": "https://example.com/mcp",
|
||||
|
|
@ -774,7 +772,8 @@ class TestMCPServerManager:
|
|||
}
|
||||
}
|
||||
|
||||
await manager.load_servers_from_config(config)
|
||||
with unittest.mock.patch.object(manager, "_descovery_metadata", side_effect=fake_discovery):
|
||||
await manager.load_servers_from_config(config)
|
||||
|
||||
server = next(iter(manager.config_mcp_servers.values()))
|
||||
assert server.scopes == ["config"] # config overrides discovery
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue