merge with recent branch

Author: SoldierSacha

tests/server/fastmcp/test_integration.py

@@ -12,6 +12,7 @@
 from collections.abc import Generator
 from typing import Any
 
+import anyio
 import pytest
 import uvicorn
 from pydantic import AnyUrl, BaseModel, Field
@@ -812,6 +813,13 @@ async def progress_callback(progress: float, total: float | None, message: str |
         params,
         progress_callback=progress_callback,
     )
+    # Progress notifications may arrive slightly after the tool result is
+    # received, so wait briefly to ensure all updates are processed.
+    if len(progress_updates) < steps:
+        for _ in range(5):
+            await anyio.sleep(0.05)
+            if len(progress_updates) == steps:
+                break
     assert len(tool_result.content) == 1
     assert isinstance(tool_result.content[0], TextContent)
     assert f"Processed '{test_message}' in {steps} steps" in tool_result.content[0].text