From a282ac417069b0364803a241d4718d8d066aa57a Mon Sep 17 00:00:00 2001 From: Yuneng Jiang Date: Fri, 17 Apr 2026 18:23:49 -0700 Subject: [PATCH] [Fix] Remove unresolved merge conflict markers in bedrock test file Fixes SyntaxError at pytest collection time caused by leftover <<<<<<<, =======, >>>>>>> markers in test_bedrock_common_utils.py. Keeps the assertion matching the model under test (claude-haiku-4-5-20251001-v1:0). --- .../test_litellm/llms/bedrock/test_bedrock_common_utils.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/test_litellm/llms/bedrock/test_bedrock_common_utils.py b/tests/test_litellm/llms/bedrock/test_bedrock_common_utils.py index a4e621b0bb..c356f866b0 100644 --- a/tests/test_litellm/llms/bedrock/test_bedrock_common_utils.py +++ b/tests/test_litellm/llms/bedrock/test_bedrock_common_utils.py @@ -34,13 +34,8 @@ def test_govcloud_cross_region_inference_prefix(): base_model = bedrock_model_info.get_base_model( model="bedrock/us-gov.anthropic.claude-haiku-4-5-20251001-v1:0" ) -<<<<<<< worktree-rustling-wishing-kite - assert base_model == "anthropic.claude-3-5-sonnet-20240620-v1:0" - -======= assert base_model == "anthropic.claude-haiku-4-5-20251001-v1:0" - ->>>>>>> main + # Test us-gov prefix is stripped correctly for different Claude versions base_model = bedrock_model_info.get_base_model( model="bedrock/us-gov.anthropic.claude-sonnet-4-5-20250929-v1:0"