address review comments

Signed-off-by: Swati Mukund Bagal <sbagal@redhat.com>

Author: SB159

tests/model_serving/maas_billing/maas_subscription/test_api_key_authorization.py

@@ -153,8 +153,4 @@ def test_non_admin_cannot_search_by_other_username(
             f"Expected 403 when free user searches by another user's username, "
             f"got {list_resp.status_code}: {list_resp.text[:200]}"
         )
-<<<<<<< HEAD
-        LOGGER.info(f"[authz] Free user correctly received 403 when searching by admin username='{admin_username}'")
-=======
         LOGGER.info("[authz] Free user correctly received 403 when searching by another user's username")
->>>>>>> 626a88d (test: update API key authorization tests)

tests/model_serving/maas_billing/maas_subscription/utils.py

@@ -300,7 +300,7 @@ def resolve_api_key_username(
         f"Expected 200 on GET /v1/api-keys/{key_id}, got {get_resp.status_code}: {get_resp.text[:200]}"
     )
     username = get_body.get("username") or get_body.get("owner")
-    assert username, f"Expected 'username' or 'owner' field in GET response: {get_body}"
+    assert username, "Expected 'username' or 'owner' field in GET response"
     return username