Skip to content

Commit a9058bb

Browse files
authored
Merge pull request #21483 from BerriAI/fix/test-delattr-default-internal-user-params
fix(tests): restore default_internal_user_params instead of delattr-ing it
2 parents d01adf5 + f542f92 commit a9058bb

File tree

2 files changed

+9
-30
lines changed

2 files changed

+9
-30
lines changed

tests/test_litellm/proxy/management_endpoints/test_internal_user_endpoints.py

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -642,12 +642,9 @@ async def mock_check_duplicate_user_id(*args, **kwargs):
642642
assert response.key == "sk-test-token-123"
643643

644644
finally:
645-
# Restore original default params
646-
if original_default_params is not None:
647-
litellm.default_internal_user_params = original_default_params
648-
else:
649-
if hasattr(litellm, "default_internal_user_params"):
650-
delattr(litellm, "default_internal_user_params")
645+
# Restore original default params (always assign, never delattr — the attribute
646+
# is defined in litellm/__init__.py and delattr-ing it breaks parallel tests)
647+
litellm.default_internal_user_params = original_default_params
651648

652649

653650
def test_update_internal_new_user_params_proxy_admin_role():
@@ -694,12 +691,7 @@ def test_update_internal_new_user_params_proxy_admin_role():
694691
assert result["user_role"] == LitellmUserRoles.PROXY_ADMIN.value
695692

696693
finally:
697-
# Restore original default params
698-
if original_default_params is not None:
699-
litellm.default_internal_user_params = original_default_params
700-
else:
701-
if hasattr(litellm, "default_internal_user_params"):
702-
delattr(litellm, "default_internal_user_params")
694+
litellm.default_internal_user_params = original_default_params
703695

704696

705697
def test_update_internal_new_user_params_no_role_specified():
@@ -735,12 +727,7 @@ def test_update_internal_new_user_params_no_role_specified():
735727
assert result["user_email"] == "user@example.com"
736728

737729
finally:
738-
# Restore original default params
739-
if original_default_params is not None:
740-
litellm.default_internal_user_params = original_default_params
741-
else:
742-
if hasattr(litellm, "default_internal_user_params"):
743-
delattr(litellm, "default_internal_user_params")
730+
litellm.default_internal_user_params = original_default_params
744731

745732

746733
def test_update_internal_new_user_params_internal_user_role():
@@ -780,12 +767,7 @@ def test_update_internal_new_user_params_internal_user_role():
780767
assert result["user_role"] == LitellmUserRoles.INTERNAL_USER.value
781768

782769
finally:
783-
# Restore original default params
784-
if original_default_params is not None:
785-
litellm.default_internal_user_params = original_default_params
786-
else:
787-
if hasattr(litellm, "default_internal_user_params"):
788-
delattr(litellm, "default_internal_user_params")
770+
litellm.default_internal_user_params = original_default_params
789771

790772

791773
@pytest.mark.asyncio

tests/test_litellm/proxy/management_endpoints/test_ui_sso.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3682,12 +3682,9 @@ async def test_role_mappings_override_default_internal_user_params():
36823682
# The models will be applied when new_user processes the request
36833683

36843684
finally:
3685-
# Restore original default_internal_user_params
3686-
if original_default_params is not None:
3687-
litellm.default_internal_user_params = original_default_params
3688-
else:
3689-
if hasattr(litellm, "default_internal_user_params"):
3690-
delattr(litellm, "default_internal_user_params")
3685+
# Restore original default_internal_user_params (always assign, never delattr —
3686+
# the attribute is defined in litellm/__init__.py and delattr-ing it breaks parallel tests)
3687+
litellm.default_internal_user_params = original_default_params
36913688

36923689

36933690
class TestSSOReadinessEndpoint:

0 commit comments

Comments
 (0)