scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-09-07 08:26:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 36

fix(tests): update mcp_tests mock to use filter_server_ids_by_ip_with_info

Browse source 
Same fix as the test_litellm tests — the integration tests in
tests/mcp_tests/ also mock the old method name. Update all
occurrences to return the expected (server_ids, blocked_count) tuple.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Julio Quinteros Pro 2026-02-26 13:27:51 -03:00
parent ace49b18d3
commit 30a7cc086c
1 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
tests/mcp_tests/test_mcp_server.py
View file

@ -658,9 +658,9 @@ async def test_list_tools_rest_api_server_not_found():
mock_manager.get_allowed_mcp_servers = AsyncMock(
return_value=["non_existent_server_id"]
)
# Mock filter_server_ids_by_ip to return input unchanged (no IP filtering in test)
mock_manager.filter_server_ids_by_ip = MagicMock(
side_effect=lambda server_ids, client_ip: server_ids
# Mock filter_server_ids_by_ip_with_info to return input unchanged (no IP filtering in test)
mock_manager.filter_server_ids_by_ip_with_info = MagicMock(
side_effect=lambda server_ids, client_ip: (server_ids, 0)
)
# Return None when trying to get the server (server doesn't exist)
mock_manager.get_mcp_server_by_id = MagicMock(return_value=None)
@ -731,9 +731,9 @@ async def test_list_tools_rest_api_success():
return_value=["test-server-123"]
)
mock_manager.get_mcp_server_by_id = MagicMock(return_value=mock_server)
# Mock filter_server_ids_by_ip to return input unchanged (no IP filtering in test)
mock_manager.filter_server_ids_by_ip = MagicMock(
side_effect=lambda server_ids, client_ip: server_ids
# Mock filter_server_ids_by_ip_with_info to return input unchanged (no IP filtering in test)
mock_manager.filter_server_ids_by_ip_with_info = MagicMock(
side_effect=lambda server_ids, client_ip: (server_ids, 0)
)
# Mock the _get_tools_for_single_server function
@ -813,9 +813,9 @@ async def test_get_tools_from_mcp_servers():
)
mock_manager.get_mcp_server_by_id = lambda server_id: mock_server_1 if server_id == "server1_id" else mock_server_2
mock_manager._get_tools_from_server = AsyncMock(return_value=[mock_tool_1])
# Mock filter_server_ids_by_ip to return input unchanged (no IP filtering in test)
mock_manager.filter_server_ids_by_ip = MagicMock(
side_effect=lambda server_ids, client_ip: server_ids
# Mock filter_server_ids_by_ip_with_info to return input unchanged (no IP filtering in test)
mock_manager.filter_server_ids_by_ip_with_info = MagicMock(
side_effect=lambda server_ids, client_ip: (server_ids, 0)
)
with patch(
@ -852,9 +852,9 @@ async def test_get_tools_from_mcp_servers():
mock_manager_2._get_tools_from_server = AsyncMock(
side_effect=mock_get_tools_side_effect
)
# Mock filter_server_ids_by_ip to return input unchanged (no IP filtering in test)
mock_manager_2.filter_server_ids_by_ip = MagicMock(
side_effect=lambda server_ids, client_ip: server_ids
# Mock filter_server_ids_by_ip_with_info to return input unchanged (no IP filtering in test)
mock_manager_2.filter_server_ids_by_ip_with_info = MagicMock(
side_effect=lambda server_ids, client_ip: (server_ids, 0)
)
with patch(
@ -880,9 +880,9 @@ async def test_get_tools_from_mcp_servers():
)
mock_manager.get_mcp_server_by_id = lambda server_id: mock_server_1 if server_id == "server1_id" else (mock_server_2 if server_id == "server2_id" else mock_server_3)
mock_manager._get_tools_from_server = AsyncMock(return_value=[mock_tool_1])
# Mock filter_server_ids_by_ip to return input unchanged (no IP filtering in test)
mock_manager.filter_server_ids_by_ip = MagicMock(
side_effect=lambda server_ids, client_ip: server_ids
# Mock filter_server_ids_by_ip_with_info to return input unchanged (no IP filtering in test)
mock_manager.filter_server_ids_by_ip_with_info = MagicMock(
side_effect=lambda server_ids, client_ip: (server_ids, 0)
)
with patch(
@ -1816,9 +1816,9 @@ async def test_list_tool_rest_api_with_server_specific_auth():
mock_server.mcp_info = {"server_name": "zapier"}
mock_manager.get_mcp_server_by_id.return_value = mock_server
# Mock filter_server_ids_by_ip to return input unchanged (no IP filtering in test)
mock_manager.filter_server_ids_by_ip = MagicMock(
side_effect=lambda server_ids, client_ip: server_ids
# Mock filter_server_ids_by_ip_with_info to return input unchanged (no IP filtering in test)
mock_manager.filter_server_ids_by_ip_with_info = MagicMock(
side_effect=lambda server_ids, client_ip: (server_ids, 0)
)
mock_user_api_key_dict = UserAPIKeyAuth(
@ -1910,9 +1910,9 @@ async def test_list_tool_rest_api_with_default_auth():
mock_server.mcp_info = {"server_name": "unknown_server"}
mock_manager.get_mcp_server_by_id.return_value = mock_server
# Mock filter_server_ids_by_ip to return input unchanged (no IP filtering in test)
mock_manager.filter_server_ids_by_ip = MagicMock(
side_effect=lambda server_ids, client_ip: server_ids
# Mock filter_server_ids_by_ip_with_info to return input unchanged (no IP filtering in test)
mock_manager.filter_server_ids_by_ip_with_info = MagicMock(
side_effect=lambda server_ids, client_ip: (server_ids, 0)
)
mock_user_api_key_dict = UserAPIKeyAuth(
@ -2020,9 +2020,9 @@ async def test_list_tool_rest_api_all_servers_with_auth():
server_id
)
)
# Mock filter_server_ids_by_ip to return input unchanged (no IP filtering in test)
mock_manager.filter_server_ids_by_ip = MagicMock(
side_effect=lambda server_ids, client_ip: server_ids
# Mock filter_server_ids_by_ip_with_info to return input unchanged (no IP filtering in test)
mock_manager.filter_server_ids_by_ip_with_info = MagicMock(
side_effect=lambda server_ids, client_ip: (server_ids, 0)
)
mock_user_api_key_dict = UserAPIKeyAuth(
@ -2153,9 +2153,9 @@ async def test_filter_tools_by_allowed_tools_integration():
return_value=["test-server-123"]
)
mock_manager.get_mcp_server_by_id = MagicMock(return_value=mock_server)
# Mock filter_server_ids_by_ip to return input unchanged (no IP filtering in test)
mock_manager.filter_server_ids_by_ip = MagicMock(
side_effect=lambda server_ids, client_ip: server_ids
# Mock filter_server_ids_by_ip_with_info to return input unchanged (no IP filtering in test)
mock_manager.filter_server_ids_by_ip_with_info = MagicMock(
side_effect=lambda server_ids, client_ip: (server_ids, 0)
)
# Mock the _get_tools_from_server method to return all tools
@ -2267,9 +2267,9 @@ async def test_filter_tools_by_disallowed_tools_integration():
return_value=["test-server-456"]
)
mock_manager.get_mcp_server_by_id = MagicMock(return_value=mock_server)
# Mock filter_server_ids_by_ip to return input unchanged (no IP filtering in test)
mock_manager.filter_server_ids_by_ip = MagicMock(
side_effect=lambda server_ids, client_ip: server_ids
# Mock filter_server_ids_by_ip_with_info to return input unchanged (no IP filtering in test)
mock_manager.filter_server_ids_by_ip_with_info = MagicMock(
side_effect=lambda server_ids, client_ip: (server_ids, 0)
)
# Mock the _get_tools_from_server method to return all tools
mock_manager._get_tools_from_server = AsyncMock(return_value=mock_tools)
@ -2367,9 +2367,9 @@ async def test_filter_tools_no_restrictions_integration():
return_value=["test-server-000"]
)
mock_manager.get_mcp_server_by_id = MagicMock(return_value=mock_server)
# Mock filter_server_ids_by_ip to return input unchanged (no IP filtering in test)
mock_manager.filter_server_ids_by_ip = MagicMock(
side_effect=lambda server_ids, client_ip: server_ids
# Mock filter_server_ids_by_ip_with_info to return input unchanged (no IP filtering in test)
mock_manager.filter_server_ids_by_ip_with_info = MagicMock(
side_effect=lambda server_ids, client_ip: (server_ids, 0)
)
# Mock the _get_tools_from_server method to return all tools