test(proxy): move proxy_server, _experimental and db tests into tests/unit/proxy (#44012)

* test(proxy): move proxy_server, _experimental and db tests into tests/unit/proxy

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

* test(proxy): keep tuple identity in proxy state restore and fix misc target paths

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

---------

Co-authored-by: yuneng <yuneng@berri.ai>
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

.github/workflows/test-unit.yml

@@ -187,7 +187,7 @@ jobs:
 
           - shard: proxy-server
             artifact-name: proxy-server
-            test-path: "tests/test_litellm/proxy/proxy_server"
+            test-path: "tests/unit/proxy/proxy_server"
             workers: 4
             reruns: 2
             timeout-minutes: 60
@@ -196,11 +196,14 @@ jobs:
           - shard: proxy-infra
             artifact-name: proxy-infra
             test-path: >-
-              tests/test_litellm/proxy/db
+              tests/unit/proxy/db
+              --ignore=tests/unit/proxy/db/db_transaction_queue/test_e2e_pod_lock_manager.py
+              --ignore=tests/unit/proxy/db/test_update_daily_tag_spend.py
               tests/test_litellm/proxy/middleware
               tests/test_litellm/proxy/spend_tracking
               tests/test_litellm/proxy/pass_through_endpoints
-              tests/test_litellm/proxy/_experimental
+              tests/unit/proxy/_experimental
+              --ignore=tests/unit/proxy/_experimental/mcp_server
               tests/test_litellm/proxy/experimental
               tests/test_litellm/proxy/common_utils
               tests/test_litellm/proxy/enterprise_billing

.gitignore

@@ -104,7 +104,7 @@ litellm_config.yaml
 .cursor
 litellm/proxy/to_delete_loadtest_work/*
 update_model_cost_map.py
-tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_server_manager.py
+tests/unit/proxy/_experimental/mcp_server/test_mcp_server_manager.py
 scripts/test_vertex_ai_search.py
 LAZY_LOADING_IMPROVEMENTS.md
 STABILIZATION_TODO.md

Makefile

@@ -324,10 +324,10 @@ test-unit-proxy-guardrails: install-test-deps
 	$(UV_RUN) pytest tests/unit/proxy/guardrails tests/unit/proxy/management_endpoints tests/unit/proxy/management_helpers --tb=short -vv -n 4 --durations=20
 
 test-unit-proxy-core: install-test-deps
-	$(UV_RUN) pytest tests/unit/proxy/auth tests/unit/proxy/client tests/test_litellm/proxy/db tests/unit/proxy/hooks tests/unit/proxy/policy_engine --tb=short -vv -n 4 --durations=20
+	$(UV_RUN) pytest tests/unit/proxy/auth tests/unit/proxy/client tests/unit/proxy/db tests/unit/proxy/hooks tests/unit/proxy/policy_engine --ignore=tests/unit/proxy/db/db_transaction_queue/test_e2e_pod_lock_manager.py --ignore=tests/unit/proxy/db/test_update_daily_tag_spend.py --tb=short -vv -n 4 --durations=20
 
 test-unit-proxy-misc: install-test-deps
-	$(UV_RUN) pytest tests/test_litellm/proxy/_experimental tests/unit/proxy/agent_endpoints tests/unit/proxy/anthropic_endpoints tests/test_litellm/proxy/common_utils tests/unit/proxy/discovery_endpoints tests/test_litellm/proxy/experimental tests/unit/proxy/google_endpoints tests/unit/proxy/health_endpoints tests/unit/proxy/image_endpoints tests/test_litellm/proxy/middleware tests/unit/proxy/openai_files_endpoint tests/test_litellm/proxy/pass_through_endpoints tests/unit/proxy/prompts tests/unit/proxy/public_endpoints tests/unit/proxy/response_api_endpoints tests/unit/proxy/shutdown tests/test_litellm/proxy/spend_tracking tests/unit/proxy/ui_crud_endpoints tests/unit/proxy/vector_store_endpoints tests/test_litellm/proxy/test_*.py tests/unit/proxy/test_proxy_server_endpoints_and_startup.py tests/unit/proxy/test_proxy_utils_model_creation_and_error_logging.py tests/unit/proxy/_experimental/mcp_server/test_mcp_server_tool_calls_and_headers.py --ignore=tests/unit/proxy/google_endpoints/test_gemini_agents_endpoints.py --ignore=tests/unit/proxy/google_endpoints/test_google_endpoint_routing.py --ignore=tests/unit/proxy/google_endpoints/test_google_gemini_proxy_request.py --ignore=tests/unit/proxy/public_endpoints/test_blog_posts_endpoint.py --tb=short -vv -n 4 --durations=20
+	$(UV_RUN) pytest tests/unit/proxy/agent_endpoints tests/unit/proxy/anthropic_endpoints tests/test_litellm/proxy/common_utils tests/unit/proxy/discovery_endpoints tests/test_litellm/proxy/experimental tests/unit/proxy/google_endpoints tests/unit/proxy/health_endpoints tests/unit/proxy/image_endpoints tests/test_litellm/proxy/middleware tests/unit/proxy/openai_files_endpoint tests/test_litellm/proxy/pass_through_endpoints tests/unit/proxy/prompts tests/unit/proxy/public_endpoints tests/unit/proxy/response_api_endpoints tests/unit/proxy/shutdown tests/test_litellm/proxy/spend_tracking tests/unit/proxy/ui_crud_endpoints tests/unit/proxy/vector_store_endpoints tests/test_litellm/proxy/test_*.py tests/unit/proxy/test_proxy_server_endpoints_and_startup.py tests/unit/proxy/test_proxy_utils_model_creation_and_error_logging.py tests/unit/proxy/_experimental/mcp_server/test_mcp_server_tool_calls_and_headers.py --ignore=tests/unit/proxy/google_endpoints/test_gemini_agents_endpoints.py --ignore=tests/unit/proxy/google_endpoints/test_google_endpoint_routing.py --ignore=tests/unit/proxy/google_endpoints/test_google_gemini_proxy_request.py --ignore=tests/unit/proxy/public_endpoints/test_blog_posts_endpoint.py --tb=short -vv -n 4 --durations=20
 
 test-unit-integrations: install-test-deps
 	$(UV_RUN) pytest tests/unit/integrations --tb=short -vv -n 4 --durations=20

tests/proxy_behavior/spend/test_autorouter_session_rollup.py

@@ -2,7 +2,7 @@
 Behavior tests for the LiteLLM_AutoRouterSession conditional upsert and the benchmarks
 aggregate, against a real Postgres. The classification lives in SQL, so these tests are
 the ones that exercise it; the builder and flush contracts are unit-tested in
-tests/test_litellm/proxy/db/test_autorouter_session_rollup.py.
+tests/unit/proxy/db/test_autorouter_session_rollup.py.
 """
 
 import asyncio

tests/test_litellm/proxy/_experimental/mcp_server/conftest.py

@@ -1,80 +0,0 @@
-import os
-
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def _hermetic_mcp_server_registry():
-    """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."""
-    from litellm.proxy._experimental.mcp_server.mcp_server_manager import (
-        global_mcp_server_manager,
-    )
-
-    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)
-    saved_oauth_slots = global_mcp_server_manager._oauth_discovery_slots
-    try:
-        yield
-    finally:
-        global_mcp_server_manager.registry.clear()
-        global_mcp_server_manager.registry.update(saved_registry)
-        global_mcp_server_manager.config_mcp_servers.clear()
-        global_mcp_server_manager.config_mcp_servers.update(saved_config_servers)
-        global_mcp_server_manager.tool_name_to_mcp_server_name_mapping.clear()
-        global_mcp_server_manager.tool_name_to_mcp_server_name_mapping.update(saved_tool_mapping)
-        global_mcp_server_manager._oauth_discovery_slots = saved_oauth_slots
-
-
-@pytest.fixture(autouse=True)
-def _hermetic_server_root_path():
-    """Isolate MCP discovery tests from a leaked ``SERVER_ROOT_PATH``.
-
-    ``tests/test_litellm/proxy/test_custom_proxy.py`` sets ``SERVER_ROOT_PATH`` at import time
-    (its app mounts under a custom path) and never restores it, so in a shared shard the value
-    leaks into this process. The discovery routes and the 401 challenges read it, so a leaked
-    value would silently rewrite every ``resource_metadata`` URL and make these tests depend on
-    shard ordering. Clearing it here pins the default (root-mounted) deployment; a test that
-    exercises a sub-path deployment sets the value explicitly within its own body.
-    """
-    saved = os.environ.pop("SERVER_ROOT_PATH", None)
-    try:
-        yield
-    finally:
-        if saved is not None:
-            os.environ["SERVER_ROOT_PATH"] = saved
-
-
-@pytest.fixture
-def config_only_mcp_manager_factory():
-    from litellm.proxy._experimental.mcp_server.mcp_server_manager import MCPServerManager
-
-    class ConfigOnlyManager(MCPServerManager):
-        def initialize_tool_name_to_mcp_server_name_mapping(self):
-            return None
-
-    return ConfigOnlyManager
-
-
-@pytest.fixture
-def _mcp_request_ctx():
-    def _mcp_request_ctx(**overrides):
-        from types import SimpleNamespace
-
-        from mcp.server.context import ServerRequestContext
-
-        kwargs = {
-            "session": SimpleNamespace(),
-            "lifespan_context": {},
-            "protocol_version": "2025-06-18",
-            "method": "",
-            "params": None,
-            "request_id": 1,
-            "meta": None,
-            "request": None,
-        }
-        kwargs.update(overrides)
-        return ServerRequestContext(**kwargs)
-
-    return _mcp_request_ctx