From d620d1ffead5c73cc6012ef7a92d603398b8a995 Mon Sep 17 00:00:00 2001
From: yucheng <yucheng@berri.ai>
Date: Sat, 12 Sep 2026 19:22:02 +0000
Subject: [PATCH] test(mcp): register OpenAPI listing fixtures directly instead
 of patching the global tool registry

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
---
 .../mcp_server/test_mcp_server_manager.py     | 48 +++++++++++--------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_manager.py b/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_manager.py
index e74a4069b15..8693227feaa 100644
--- a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_manager.py
+++ b/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_manager.py
@@ -6651,14 +6651,17 @@ class TestMCPServerManager:
         async def _handler(**kwargs):
             return None
 
-        with patch.dict(global_mcp_tool_registry.tools, {}, clear=True):
-            global_mcp_tool_registry.register_tool(
-                name="petstore-list_pets",
-                description="List pets",
-                input_schema={"type": "object", "properties": {"limit": {"type": "integer"}}},
-                handler=_handler,
-            )
+        global_mcp_tool_registry.unregister_tools_with_prefix("petstore-")
+        global_mcp_tool_registry.register_tool(
+            name="petstore-list_pets",
+            description="List pets",
+            input_schema={"type": "object", "properties": {"limit": {"type": "integer"}}},
+            handler=_handler,
+        )
+        try:
             listed = await manager._get_tools_from_server(server=server, add_prefix=add_prefix)
+        finally:
+            global_mcp_tool_registry.unregister_tools_with_prefix("petstore-")
 
         assert [t.name for t in listed] == ["petstore-list_pets" if add_prefix else "list_pets"]
         for name in ("list_pets", "petstore-list_pets"):
@@ -6684,20 +6687,25 @@ class TestMCPServerManager:
         async def _handler(**kwargs):
             return None
 
-        with patch.dict(global_mcp_tool_registry.tools, {}, clear=True):
-            global_mcp_tool_registry.register_tool(
-                name="pet-petstore-list",
-                description="Local pet tool",
-                input_schema={"type": "object", "properties": {"limit": {"type": "integer"}}},
-                handler=_handler,
-            )
-            global_mcp_tool_registry.register_tool(
-                name="petstore-list",
-                description="Foreign petstore tool",
-                input_schema={"type": "object", "properties": {"status": {"type": "string"}}},
-                handler=_handler,
-            )
+        for prefix in ("pet-", "petstore-"):
+            global_mcp_tool_registry.unregister_tools_with_prefix(prefix)
+        global_mcp_tool_registry.register_tool(
+            name="pet-petstore-list",
+            description="Local pet tool",
+            input_schema={"type": "object", "properties": {"limit": {"type": "integer"}}},
+            handler=_handler,
+        )
+        global_mcp_tool_registry.register_tool(
+            name="petstore-list",
+            description="Foreign petstore tool",
+            input_schema={"type": "object", "properties": {"status": {"type": "string"}}},
+            handler=_handler,
+        )
+        try:
             listed = await manager._get_tools_from_server(server=server, add_prefix=True)
+        finally:
+            for prefix in ("pet-", "petstore-"):
+                global_mcp_tool_registry.unregister_tools_with_prefix(prefix)
 
         assert [t.name for t in listed] == ["pet-petstore-list"]
         tool = manager.get_listed_tool(server, "petstore-list")