From 5411ebedae0f77ed0832289ae877a75a1cca836f Mon Sep 17 00:00:00 2001
From: Yuneng Jiang <yuneng@berri.ai>
Date: Mon, 20 Apr 2026 21:03:07 -0700
Subject: [PATCH] [Fix] conftest snapshot: also reset scalar module attributes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The previous snapshot only tracked list/dict/set values. Tests mutate
scalar module attrs too — master_key, premium_user, prisma_client — and
importlib.reload used to reset those implicitly. Under the snapshot
approach they were leaking between tests, so test_active_callbacks
failed in CI with "No api key passed in." once an earlier test left
master_key set to sk-1234.

Expand the snapshot to cover primitives (str/int/float/bool/bytes/tuple)
and None-valued attributes. Complex object instances are still skipped
to avoid deepcopy issues.
---
 tests/proxy_unit_tests/conftest.py | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/tests/proxy_unit_tests/conftest.py b/tests/proxy_unit_tests/conftest.py
index 0cde5bdf28b..544b6a0b421 100644
--- a/tests/proxy_unit_tests/conftest.py
+++ b/tests/proxy_unit_tests/conftest.py
@@ -15,12 +15,17 @@ import litellm
 import litellm.proxy.proxy_server
 
 
-def _snapshot_mutable_state(module):
-    """Deep-copy every list/dict/set module attribute for later restore.
+_SNAPSHOT_TYPES = (list, dict, set, tuple, str, int, float, bool, bytes)
 
-    Classes, functions, submodules and primitives are skipped — only the
-    collections that tests mutate (callbacks, caches, routers, etc.) need
-    per-test isolation.
+
+def _snapshot_mutable_state(module):
+    """Snapshot every module attribute that importlib.reload would have reset.
+
+    Covers the top-level assignments that tests mutate — collections
+    (callbacks, caches, general_settings) plus scalar flags (master_key,
+    premium_user, etc.) that gate auth and feature behavior. Classes,
+    functions, submodules and complex object instances are skipped: those
+    either aren't meant to be reset or can't round-trip through deepcopy.
     """
     snapshot = {}
     for attr in list(vars(module)):
@@ -30,12 +35,12 @@ def _snapshot_mutable_state(module):
             value = getattr(module, attr)
         except Exception:
             continue
-        if isinstance(value, (list, dict, set)):
+        if value is None or isinstance(value, _SNAPSHOT_TYPES):
             try:
                 snapshot[attr] = copy.deepcopy(value)
             except Exception:
-                # Unpickleable collections (e.g. holding open clients) can't
-                # round-trip through deepcopy; skip them rather than crash.
+                # Skip anything that can't round-trip through deepcopy
+                # rather than crash collection.
                 pass
     return snapshot