Fix remaining async issues found in fresh review

- async_fetchxml_query.py: fix leftover await r.json() -> r.json()
- _async_odata.py: add TYPE_CHECKING guard for aiohttp annotation
- test helpers: replace AsyncMock with MagicMock for .json/.text on
  _AsyncResponse-compatible mocks (body already materialized, no await)

All 2155 tests pass.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: Abel Milash

src/PowerPlatform/Dataverse/aio/data/_async_odata.py

@@ -12,7 +12,10 @@
 import time
 import warnings
 from datetime import datetime, timezone
-from typing import Any, AsyncIterator, Dict, List, Optional, Union
+from typing import TYPE_CHECKING, Any, AsyncIterator, Dict, List, Optional, Union
+
+if TYPE_CHECKING:
+    import aiohttp
 
 from urllib.parse import quote as _url_quote
 

src/PowerPlatform/Dataverse/aio/models/async_fetchxml_query.py

@@ -100,7 +100,7 @@ async def execute_pages(self) -> AsyncIterator[QueryResult]:
                     params={"fetchXml": current_xml},
                 )
                 try:
-                    data = await r.json(content_type=None)
+                    data = r.json()
                 except Exception:
                     data = {}
 

tests/unit/aio/core/test_async_http.py

@@ -15,7 +15,6 @@ def _make_resp(status: int = 200) -> MagicMock:
     resp.status = status
     resp.headers = {}
     resp.read = AsyncMock(return_value=b"")
-    resp.text = AsyncMock(return_value="")
     return resp
 
 

tests/unit/aio/data/test_async_batch_internal.py

@@ -133,12 +133,13 @@ def _make_batch_client():
 
 
 def _batch_resp(status=200, text="", json_payload=None):
-    """Create a mock response suitable for the batch execute() path."""
+    """Create a mock _AsyncResponse-compatible response for the batch execute() path."""
     r = MagicMock()
     r.status = status
+    r.status_code = status
     r.headers = {"Content-Type": "application/json"}
-    r.text = AsyncMock(return_value=text)
-    r.json = AsyncMock(return_value=json_payload or {})
+    r.text = text
+    r.json = MagicMock(return_value=json_payload or {})
     return r
 
 

tests/unit/aio/data/test_async_upload.py

@@ -26,13 +26,11 @@ def _make_client() -> _AsyncODataClient:
 
 
 def _resp(status=200, headers=None, json_data=None):
-    """Create a mock aiohttp-compatible response."""
+    """Create a mock _AsyncResponse-compatible response."""
     r = MagicMock()
     r.status = status
     r.headers = headers or {}
-    r.text = AsyncMock(return_value="")
-    r.json = AsyncMock(return_value=json_data or {})
-    r.read = AsyncMock(return_value=b"")
+    r.json = MagicMock(return_value=json_data or {})
     return r
 
 

tests/unit/aio/test_async_query.py

@@ -148,7 +148,7 @@ async def test_execute_returns_query_result(self, async_client, mock_od):
         mock_od._entity_set_from_schema_name = AsyncMock(return_value="accounts")
 
         resp = MagicMock()
-        resp.json = AsyncMock(return_value={
+        resp.json = MagicMock(return_value={
             "value": [{"name": "Contoso", "accountid": "g1"}],
             "@Microsoft.Dynamics.CRM.morerecords": False,
         })
@@ -165,7 +165,7 @@ async def test_execute_pages_yields_pages(self, async_client, mock_od):
         mock_od._entity_set_from_schema_name = AsyncMock(return_value="accounts")
 
         resp = MagicMock()
-        resp.json = AsyncMock(return_value={
+        resp.json = MagicMock(return_value={
             "value": [{"name": "Contoso", "accountid": "g1"}],
             "@Microsoft.Dynamics.CRM.morerecords": False,
         })
@@ -410,13 +410,13 @@ async def test_execute_multi_page_with_cookie(self, async_client, mock_od):
         paging_cookie = f'<cookie pagenumber="2" pagingcookie="{encoded}" istracking="false" />'
 
         page1 = MagicMock()
-        page1.json = AsyncMock(return_value={
+        page1.json = MagicMock(return_value={
             "value": [{"name": "Contoso", "accountid": "g1"}],
             "@Microsoft.Dynamics.CRM.morerecords": True,
             "@Microsoft.Dynamics.CRM.fetchxmlpagingcookie": paging_cookie,
         })
         page2 = MagicMock()
-        page2.json = AsyncMock(return_value={
+        page2.json = MagicMock(return_value={
             "value": [{"name": "Fabrikam", "accountid": "g2"}],
             "@Microsoft.Dynamics.CRM.morerecords": False,
         })
@@ -435,13 +435,13 @@ async def test_execute_multi_page_cookie_parse_error_fallback(self, async_client
         mock_od._entity_set_from_schema_name = AsyncMock(return_value="accounts")
 
         page1 = MagicMock()
-        page1.json = AsyncMock(return_value={
+        page1.json = MagicMock(return_value={
             "value": [{"name": "Contoso", "accountid": "g1"}],
             "@Microsoft.Dynamics.CRM.morerecords": True,
             "@Microsoft.Dynamics.CRM.fetchxmlpagingcookie": "<<<not valid xml>>>",
         })
         page2 = MagicMock()
-        page2.json = AsyncMock(return_value={
+        page2.json = MagicMock(return_value={
             "value": [{"name": "Fabrikam", "accountid": "g2"}],
             "@Microsoft.Dynamics.CRM.morerecords": False,
         })
@@ -461,13 +461,13 @@ async def test_execute_multi_page_no_cookie_simple_paging(self, async_client, mo
         mock_od._entity_set_from_schema_name = AsyncMock(return_value="accounts")
 
         page1 = MagicMock()
-        page1.json = AsyncMock(return_value={
+        page1.json = MagicMock(return_value={
             "value": [{"name": "Contoso", "accountid": "g1"}],
             "@Microsoft.Dynamics.CRM.morerecords": True,
             # No fetchxmlpagingcookie key
         })
         page2 = MagicMock()
-        page2.json = AsyncMock(return_value={
+        page2.json = MagicMock(return_value={
             "value": [{"name": "Fabrikam", "accountid": "g2"}],
             "@Microsoft.Dynamics.CRM.morerecords": False,
         })
@@ -485,7 +485,7 @@ async def test_execute_json_parse_error_yields_empty_page(self, async_client, mo
         mock_od._entity_set_from_schema_name = AsyncMock(return_value="accounts")
 
         resp = MagicMock()
-        resp.json = AsyncMock(side_effect=Exception("invalid json"))
+        resp.json = MagicMock(side_effect=Exception("invalid json"))
         mock_od._request = AsyncMock(return_value=resp)
 
         result = await async_client.query.fetchxml(_SIMPLE_FETCHXML).execute()
@@ -504,7 +504,7 @@ def _make_page_resp(page_num: int):
             encoded = urllib.parse.quote(urllib.parse.quote(inner))
             cookie = f'<cookie pagenumber="{page_num + 1}" pagingcookie="{encoded}" istracking="false" />'
             resp = MagicMock()
-            resp.json = AsyncMock(return_value={
+            resp.json = MagicMock(return_value={
                 "value": [{"name": f"Record{page_num}", "accountid": f"g{page_num}"}],
                 "@Microsoft.Dynamics.CRM.morerecords": True,
                 "@Microsoft.Dynamics.CRM.fetchxmlpagingcookie": cookie,