Fix tests

Author: strawgate

pydantic_ai_slim/pydantic_ai/toolsets/abstract.py

@@ -149,5 +149,3 @@ def renamed(self, name_map: dict[str, str]) -> RenamedToolset[AgentDepsT]:
         from .renamed import RenamedToolset
 
         return RenamedToolset(self, name_map)
-
-

pydantic_ai_slim/pydantic_ai/toolsets/combined.py

@@ -71,4 +71,4 @@ async def call_tool(
 
     def apply(self, visitor: Callable[[AbstractToolset[AgentDepsT]], None]) -> None:
         for toolset in self.toolsets:
-            toolset.apply(visitor)
+            toolset.apply(visitor)

pydantic_ai_slim/pydantic_ai/toolsets/dynamic.py

@@ -96,6 +96,9 @@ async def test_context_manager_initialization_error() -> None:
     server = MCPServerStdio('python', ['-m', 'tests.mcp_server'])
     from mcp.client.session import ClientSession
 
+    with pytest.raises(Exception):
+        _ = server.client
+
     with patch.object(ClientSession, 'initialize', side_effect=Exception):
         with pytest.raises(Exception):
             async with server.setup():

tests/test_mcp.py

@@ -5,10 +5,11 @@
 from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
 from dataclasses import dataclass, replace
-from typing import Any, Self, TypeVar
+from typing import Any, TypeVar
 
 import pytest
 from inline_snapshot import snapshot
+from typing_extensions import Self
 
 from pydantic_ai._run_context import RunContext
 from pydantic_ai._tool_manager import ToolManager
@@ -491,15 +492,14 @@ class FailingToolset(AbstractToolset[Any]):
         async def setup(self) -> AsyncGenerator[Self, Any]:
             raise InitializationError
 
-            yield self
+            yield self  # pragma: no cover
 
         async def get_tools(self, ctx: RunContext[Any]) -> dict[str, ToolsetTool[Any]]:
             return {}
 
         async def call_tool(
             self, name: str, tool_args: dict[str, Any], ctx: RunContext[Any], tool: ToolsetTool[Any]
-        ) -> Any:
-            return None
+        ) -> Any: ...
 
     server1 = MCPServerStdio('python', ['-m', 'tests.mcp_server'])
     server2 = FailingToolset()