From 5f44bdd1c1230e4ce18515453c8747cb55d7cf4a Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Tue, 1 Sep 2026 11:06:08 +0000
Subject: [PATCH] test: trim mcp fixture docstring and reload comment

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
---
 .../proxy/_experimental/mcp_server/conftest.py        | 11 ++---------
 .../mcp_server/test_mcp_server_identity_env.py        |  8 +++-----
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/conftest.py b/tests/test_litellm/proxy/_experimental/mcp_server/conftest.py
index c559e023c47..2ccba2b2055 100644
--- a/tests/test_litellm/proxy/_experimental/mcp_server/conftest.py
+++ b/tests/test_litellm/proxy/_experimental/mcp_server/conftest.py
@@ -9,15 +9,8 @@ from litellm.proxy._experimental.mcp_server.mcp_server_manager import (
 
 @pytest.fixture(autouse=True)
 def _hermetic_mcp_server_registry():
-    """Snapshot and restore the global manager's server-registry state around every test.
-
-    ``global_mcp_server_manager`` is a module-global singleton, and many tests in this
-    package seed ``registry``/``config_mcp_servers`` (or clear them) without cleaning up.
-    In a shared CI shard the leaked entries poison later tests in the same worker, e.g.
-    the ``all_proxy_servers`` sentinel expansion in ``auth/`` suddenly sees a bridge
-    server registered by a discovery test, so the outcome depends on xdist scheduling.
-    Restoring the state here makes ordering irrelevant.
-    """
+    """Restore the singleton ``global_mcp_server_manager``'s registry state around every
+    test, so entries seeded by one test never leak into another on a shared shard."""
     saved_registry = dict(global_mcp_server_manager.registry)
     saved_config_servers = dict(global_mcp_server_manager.config_mcp_servers)
     saved_tool_mapping = dict(global_mcp_server_manager.tool_name_to_mcp_server_name_mapping)
diff --git a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_identity_env.py b/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_identity_env.py
index 934810c305f..1c65adac4c6 100644
--- a/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_identity_env.py
+++ b/tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_identity_env.py
@@ -25,11 +25,9 @@ def _env_and_reload(**env):
     saved = {key: os.environ.get(key) for key in env}
     utils_module = importlib.import_module(UTILS_MODULE)
     mgmt_module = importlib.import_module(MGMT_MODULE)
-    # Restore the pre-reload module attributes afterwards instead of reloading
-    # a third time: a reload re-creates every class in the module, so modules
-    # that imported names like MCPMissingUserEnvVarsError before this test
-    # would keep raising the old class while pytest.raises in later tests
-    # matches the new one
+    # Restore pre-reload module attributes afterwards instead of reloading again:
+    # a reload re-creates the module's classes, breaking exception identity for
+    # modules that imported them earlier
     snapshots = {module: dict(vars(module)) for module in (utils_module, mgmt_module)}
 
     def _apply_env(values):