test: reorder test_utils tail to keep the daily merge conflict-free

[yuneng-berri]

Relevant issues

Unblocks #33784 (the daily OSS branch merge into litellm_internal_staging), which is currently CONFLICTING on this single file

Linear ticket

Pre-Submission checklist

Please complete all items before asking a LiteLLM maintainer to review your PR

• I have added meaningful tests
• My PR passes all CI/CD checks (e.g., lint, format, unit tests)
• My PR's scope is as isolated as possible; it only solves 1 specific problem
• I have received a Greptile Confidence Score of at least 4/5 before requesting a maintainer review (Greptile reviews automatically once the PR is opened; only comment @greptileai to re-request a review after pushing changes)

Screenshots / Proof of Fix

This change has no runtime or proxy surface; it only reorders two blocks in a unit-test file so the daily merge stays clean, so the meaningful proof is that the branch merge #33784 performs goes from conflicting to clean with both branches' tests preserved

Before, merging the current daily OSS tip into litellm_internal_staging:

$ git merge --no-commit --no-ff origin/litellm_oss_daily_2026_07_16
CONFLICT (content): Merge conflict in tests/test_litellm/test_utils.py
Automatic merge failed; fix conflicts and then commit the result.
# conflicted files: tests/test_litellm/test_utils.py

After, merging this branch into litellm_internal_staging:

$ git merge --no-commit --no-ff origin/litellm_/resolve-merge-conflicts-e10f1c
Auto-merging tests/test_litellm/test_utils.py
Automatic merge went well; stopped before committing as requested
# conflicted files: (none)

The merged file keeps everything from both sides: staging's per-model prompt-cache tests and their top-of-file imports (get_prompt_cache_min_tokens, is_prompt_caching_valid_prompt), and this branch's TestVertexEmbeddingEncodingFormat. No test body changes on either side

Type

✅ Test

Changes

On the daily OSS branch, tests/test_litellm/test_utils.py appended TestVertexEmbeddingEncodingFormat (from #33617) at the very end of the file. On litellm_internal_staging, the per-model prompt-cache tests were independently appended at the same end-of-file position. Git cannot order two unrelated insertions that share one anchor, so the branch merge collides there even though nothing actually overlaps

This moves TestVertexEmbeddingEncodingFormat to sit just above test_gemini_image_models_do_not_support_reasoning, a test both branches already share unchanged. That leaves the gemini test as the file's tail, so staging's additions and this branch's additions land at different anchors and git merges both cleanly. It is a pure reorder with no test-logic change, and it deliberately pulls no litellm_internal_staging content into the OSS branch, so the public daily branch is not synced with internal staging

Final Attestation

• The tests check the right things, including the edge cases, and regressions in the respective real-world customer use-cases are not possible after this PR

[greptile-apps]

Greptile Summary

This PR reorders two blocks in tests/test_litellm/test_utils.py to resolve a merge conflict caused by independent end-of-file insertions on the OSS daily branch and litellm_internal_staging. No test assertions, fixtures, or imports are modified.

• TestVertexEmbeddingEncodingFormat (added by fix(embeddings): accept encoding_format="float" for vertex_ai/gemini embeddings #33617) is moved to sit just above test_gemini_image_models_do_not_support_reasoning, so the gemini test remains the file's tail and staging's new tests can land at a different anchor without conflict.
• The test_gemini_image_models_do_not_support_reasoning function is reproduced verbatim at the end of the file — every parametrized model, every assertion, every error message is identical to the original.

Confidence Score: 5/5

Safe to merge — this is a pure test-block reorder with no logic changes.

Every assertion, parametrize decorator, and fixture reference in test_gemini_image_models_do_not_support_reasoning is reproduced exactly at its new position. TestVertexEmbeddingEncodingFormat is untouched. No production code is affected.

No files require special attention.

Important Files Changed

Filename	Overview
tests/test_litellm/test_utils.py	Pure reorder: moves TestVertexEmbeddingEncodingFormat above test_gemini_image_models_do_not_support_reasoning to give staging's additions a clean anchor point; no test logic is changed.

_{Reviews (1): Last reviewed commit: "test: reorder test_utils tail to keep th..." | Re-trigger Greptile}

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!