From 64d3d7626f9815fd616017f000e5e88962d48f32 Mon Sep 17 00:00:00 2001 From: yuneng-jiang Date: Wed, 11 Mar 2026 13:08:48 -0700 Subject: [PATCH] [Fix] Flaky MCP server and AgentCore streaming tests in CI - MCP tests: set mock_mcp_server.oauth2_flow = None to prevent MagicMock leaking into Pydantic Literal validation for MCPServer - AgentCore tests: pass api_key="test-jwt-token" to bypass SigV4 credential lookup that fails in CI without AWS credentials Co-Authored-By: Claude Opus 4.6 --- tests/mcp_tests/test_mcp_server.py | 3 +++ .../bedrock/chat/agentcore/test_agentcore_transformation.py | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/tests/mcp_tests/test_mcp_server.py b/tests/mcp_tests/test_mcp_server.py index 128ca517ba5..5a0a42d6f77 100644 --- a/tests/mcp_tests/test_mcp_server.py +++ b/tests/mcp_tests/test_mcp_server.py @@ -1456,6 +1456,7 @@ async def test_add_update_server_with_alias(): mock_mcp_server.authorization_url = None mock_mcp_server.registration_url = None mock_mcp_server.token_url = None + mock_mcp_server.oauth2_flow = None # Additional fields used by build_mcp_server_from_table mock_mcp_server.extra_headers = None mock_mcp_server.allow_all_keys = False @@ -1511,6 +1512,7 @@ async def test_add_update_server_without_alias(): mock_mcp_server.authorization_url = None mock_mcp_server.registration_url = None mock_mcp_server.token_url = None + mock_mcp_server.oauth2_flow = None # Additional fields used by build_mcp_server_from_table mock_mcp_server.extra_headers = None mock_mcp_server.allow_all_keys = False @@ -1566,6 +1568,7 @@ async def test_add_update_server_fallback_to_server_id(): mock_mcp_server.authorization_url = None mock_mcp_server.registration_url = None mock_mcp_server.token_url = None + mock_mcp_server.oauth2_flow = None # Additional fields used by build_mcp_server_from_table - set explicitly # to avoid MagicMock objects being passed to Pydantic MCPServer constructor mock_mcp_server.extra_headers = None diff --git a/tests/test_litellm/llms/bedrock/chat/agentcore/test_agentcore_transformation.py b/tests/test_litellm/llms/bedrock/chat/agentcore/test_agentcore_transformation.py index acb55a97399..3dede83032a 100644 --- a/tests/test_litellm/llms/bedrock/chat/agentcore/test_agentcore_transformation.py +++ b/tests/test_litellm/llms/bedrock/chat/agentcore/test_agentcore_transformation.py @@ -219,6 +219,7 @@ class TestAgentCoreStreamingJsonFallback: messages=[{"role": "user", "content": "test"}], stream=True, client=client, + api_key="test-jwt-token", ) # Collect content across all chunks @@ -257,6 +258,7 @@ class TestAgentCoreStreamingJsonFallback: messages=[{"role": "user", "content": "test"}], stream=True, client=client, + api_key="test-jwt-token", ) # Collect content across all chunks @@ -289,6 +291,7 @@ class TestAgentCoreStreamingJsonFallback: messages=[{"role": "user", "content": "test"}], stream=True, client=client, + api_key="test-jwt-token", ) async def test_async_streaming_malformed_json_raises_error(self): @@ -316,4 +319,5 @@ class TestAgentCoreStreamingJsonFallback: messages=[{"role": "user", "content": "test"}], stream=True, client=client, + api_key="test-jwt-token", )