🐛 solve undetected merge conflict with main

[yannicks1]

🐛 solve undetected merge conflict with main

There was a undetected merge conflict of #425 and #428. This PR fixes the conflict in the added tests.

[yannicks1]

bot:test

[wallashss]

LGTM, please rename the title before merge.

[github-actions]

👋 Hi! Thank you for contributing to vLLM support on Spyre.
Just a reminder: Make sure that your code passes all the linting checks, otherwise your PR won't be able to be merged. To do so, first install the linting requirements, then run format.sh and commit the changes. This can be done with uv directly:

uv sync --frozen --group lint --active --inexact

Or this can be done with pip:

uv pip compile --group lint > requirements-lint.txt
pip install -r requirements-lint.txt
bash format.sh

Now you are good to go 🚀

[yannicks1]

@joerunde should we maybe enforce syncing with main again before merging PRs to prevent bugs like this in the future? I believe the initial reason for dropping it was triggering GHA less frequently, or was there another motivation too?