test: move asserts inside async-with for 3.11 coverage instrumentation

coverage.py on Python 3.11 doesn't record statements after an
'async with running_pair(...)' exit when there's a nested
'with anyio.fail_after()' inside. Same workaround as 0a8f0f4 in PR2 —
move the asserts inside the async-with block.

Author: maxisbey

tests/server/test_server_context.py

@@ -44,11 +44,11 @@ async def server_on_request(dctx: DCtx, method: str, params: Mapping[str, Any] |
         conn.__init__(server, has_standalone_channel=True)
         with anyio.fail_after(5):
             await client.send_raw_request("t", None)
-    ctx = captured[0]
-    assert ctx.lifespan.name == "app"
-    assert ctx.connection is conn
-    assert ctx.transport.kind == "direct"
-    assert ctx.can_send_request is True
+        ctx = captured[0]
+        assert ctx.lifespan.name == "app"
+        assert ctx.connection is conn
+        assert ctx.transport.kind == "direct"
+        assert ctx.can_send_request is True
 
 
 @pytest.mark.anyio
@@ -80,8 +80,8 @@ async def server_on_request(dctx: DCtx, method: str, params: Mapping[str, Any] |
     ) as (client, *_):
         with anyio.fail_after(5):
             await client.send_raw_request("tools/call", None)
-    assert crec.requests[0][0] == "sampling/createMessage"
-    assert isinstance(results[0], CreateMessageResult)
+        assert crec.requests[0][0] == "sampling/createMessage"
+        assert isinstance(results[0], CreateMessageResult)
 
 
 @pytest.mark.anyio
@@ -104,7 +104,7 @@ async def server_on_request(dctx: DCtx, method: str, params: Mapping[str, Any] |
     ):
         with anyio.fail_after(5):
             await client.send_raw_request("t", None)
-    assert isinstance(results[0], ListRootsResult)
+        assert isinstance(results[0], ListRootsResult)
 
 
 @pytest.mark.anyio
@@ -126,9 +126,9 @@ async def server_on_request(dctx: DCtx, method: str, params: Mapping[str, Any] |
         with anyio.fail_after(5):
             await client.send_raw_request("t", None)
             await crec.notified.wait()
-    method, params = crec.notifications[0]
-    assert method == "notifications/message"
-    assert params is not None and params["level"] == "debug" and params["data"] == "hello"
+        method, params = crec.notifications[0]
+        assert method == "notifications/message"
+        assert params is not None and params["level"] == "debug" and params["data"] == "hello"
 
 
 @pytest.mark.anyio
@@ -150,7 +150,7 @@ async def server_on_request(dctx: DCtx, method: str, params: Mapping[str, Any] |
         with anyio.fail_after(5):
             await client.send_raw_request("t", None)
             await crec.notified.wait()
-    _, params = crec.notifications[0]
-    assert params is not None
-    assert params["logger"] == "my.log"
-    assert params["_meta"] == {"traceId": "t"}
+        _, params = crec.notifications[0]
+        assert params is not None
+        assert params["logger"] == "my.log"
+        assert params["_meta"] == {"traceId": "t"}

tests/shared/test_context.py

@@ -34,11 +34,11 @@ async def server_on_request(ctx: DCtx, method: str, params: Mapping[str, Any] |
     async with running_pair(direct_pair, server_on_request=server_on_request) as (client, *_):
         with anyio.fail_after(5):
             await client.send_raw_request("t", None)
-    bctx = captured[0]
-    assert bctx.transport.kind == "direct"
-    assert isinstance(bctx.cancel_requested, anyio.Event)
-    assert bctx.can_send_request is True
-    assert bctx.meta is None
+        bctx = captured[0]
+        assert bctx.transport.kind == "direct"
+        assert isinstance(bctx.cancel_requested, anyio.Event)
+        assert bctx.can_send_request is True
+        assert bctx.meta is None
 
 
 @pytest.mark.anyio
@@ -61,9 +61,9 @@ async def server_on_request(ctx: DCtx, method: str, params: Mapping[str, Any] |
         with anyio.fail_after(5):
             result = await client.send_raw_request("tools/call", None)
             await crec.notified.wait()
-    assert crec.requests == [("sampling/createMessage", {"x": 1})]
-    assert crec.notifications == [("notifications/message", {"level": "info"})]
-    assert result["sample"] == {"echoed": "sampling/createMessage", "params": {"x": 1}}
+        assert crec.requests == [("sampling/createMessage", {"x": 1})]
+        assert crec.notifications == [("notifications/message", {"level": "info"})]
+        assert result["sample"] == {"echoed": "sampling/createMessage", "params": {"x": 1}}
 
 
 @pytest.mark.anyio
@@ -81,7 +81,7 @@ async def server_on_request(ctx: DCtx, method: str, params: Mapping[str, Any] |
     async with running_pair(direct_pair, server_on_request=server_on_request) as (client, *_):
         with anyio.fail_after(5):
             await client.send_raw_request("t", None, {"on_progress": on_progress})
-    assert received == [(0.5, 1.0, "halfway")]
+        assert received == [(0.5, 1.0, "halfway")]
 
 
 @pytest.mark.anyio
@@ -100,7 +100,7 @@ async def server_on_request(ctx: DCtx, method: str, params: Mapping[str, Any] |
     ) as (client, *_):
         with anyio.fail_after(5):
             await client.send_raw_request("t", None)
-    assert crec.requests == [("ping", None)]
+        assert crec.requests == [("ping", None)]
 
 
 @pytest.mark.anyio

tests/shared/test_peer.py

@@ -50,11 +50,11 @@ async def test_peer_sample_sends_create_message_and_returns_typed_result():
                 [SamplingMessage(role="user", content=TextContent(type="text", text="hello"))],
                 max_tokens=10,
             )
-    method, params = rec.seen[0]
-    assert method == "sampling/createMessage"
-    assert params is not None and params["maxTokens"] == 10
-    assert isinstance(result, CreateMessageResult)
-    assert result.model == "m"
+        method, params = rec.seen[0]
+        assert method == "sampling/createMessage"
+        assert params is not None and params["maxTokens"] == 10
+        assert isinstance(result, CreateMessageResult)
+        assert result.model == "m"
 
 
 @pytest.mark.anyio
@@ -68,10 +68,10 @@ async def test_peer_sample_with_tools_returns_with_tools_result():
                 max_tokens=5,
                 tools=[Tool(name="t", input_schema={"type": "object"})],
             )
-    method, params = rec.seen[0]
-    assert method == "sampling/createMessage"
-    assert params is not None and params["tools"][0]["name"] == "t"
-    assert isinstance(result, CreateMessageResultWithTools)
+        method, params = rec.seen[0]
+        assert method == "sampling/createMessage"
+        assert params is not None and params["tools"][0]["name"] == "t"
+        assert isinstance(result, CreateMessageResultWithTools)
 
 
 @pytest.mark.anyio
@@ -81,11 +81,11 @@ async def test_peer_elicit_form_sends_elicitation_create_with_form_params():
         peer = Peer(client)
         with anyio.fail_after(5):
             result = await peer.elicit_form("Your name?", requested_schema={"type": "object", "properties": {}})
-    method, params = rec.seen[0]
-    assert method == "elicitation/create"
-    assert params is not None and params["mode"] == "form"
-    assert params["message"] == "Your name?"
-    assert isinstance(result, ElicitResult)
+        method, params = rec.seen[0]
+        assert method == "elicitation/create"
+        assert params is not None and params["mode"] == "form"
+        assert params["message"] == "Your name?"
+        assert isinstance(result, ElicitResult)
 
 
 @pytest.mark.anyio
@@ -95,11 +95,11 @@ async def test_peer_elicit_url_sends_elicitation_create_with_url_params():
         peer = Peer(client)
         with anyio.fail_after(5):
             result = await peer.elicit_url("Auth needed", url="https://example.com/auth", elicitation_id="e1")
-    method, params = rec.seen[0]
-    assert method == "elicitation/create"
-    assert params is not None and params["mode"] == "url"
-    assert params["url"] == "https://example.com/auth"
-    assert isinstance(result, ElicitResult)
+        method, params = rec.seen[0]
+        assert method == "elicitation/create"
+        assert params is not None and params["mode"] == "url"
+        assert params["url"] == "https://example.com/auth"
+        assert isinstance(result, ElicitResult)
 
 
 @pytest.mark.anyio
@@ -109,11 +109,11 @@ async def test_peer_list_roots_sends_roots_list_and_returns_typed_result():
         peer = Peer(client)
         with anyio.fail_after(5):
             result = await peer.list_roots()
-    method, _ = rec.seen[0]
-    assert method == "roots/list"
-    assert isinstance(result, ListRootsResult)
-    assert len(result.roots) == 1
-    assert str(result.roots[0].uri) == "file:///workspace"
+        method, _ = rec.seen[0]
+        assert method == "roots/list"
+        assert isinstance(result, ListRootsResult)
+        assert len(result.roots) == 1
+        assert str(result.roots[0].uri) == "file:///workspace"
 
 
 @pytest.mark.anyio
@@ -123,9 +123,9 @@ async def test_peer_list_roots_with_meta_sends_meta_in_params():
         peer = Peer(client)
         with anyio.fail_after(5):
             await peer.list_roots(meta={"traceId": "t1"})
-    method, params = rec.seen[0]
-    assert method == "roots/list"
-    assert params == {"_meta": {"traceId": "t1"}}
+        method, params = rec.seen[0]
+        assert method == "roots/list"
+        assert params == {"_meta": {"traceId": "t1"}}
 
 
 def test_dump_params_merges_meta_over_model_meta():
@@ -159,6 +159,6 @@ async def test_peer_ping_sends_ping_and_returns_none():
         peer = Peer(client)
         with anyio.fail_after(5):
             result = await peer.ping()
-    method, _ = rec.seen[0]
-    assert method == "ping"
-    assert result is None
+        method, _ = rec.seen[0]
+        assert method == "ping"
+        assert result is None