see if PyPy error moves

tests/conftest.py

@@ -17,7 +17,6 @@
 import zlib_ng.zlib_ng
 from blockbuster import blockbuster_ctx
 
-from aiohttp import payload
 from aiohttp.client_proto import ResponseHandler
 from aiohttp.compression_utils import ZLibBackend, ZLibBackendProtocol, set_zlib_backend
 from aiohttp.http import WS_KEY
@@ -332,18 +331,3 @@ def parametrize_zlib_backend(
     yield
 
     set_zlib_backend(original_backend)
-
-
-@pytest.fixture()
-def cleanup_payload_pending_file_closes(
-    loop: asyncio.AbstractEventLoop,
-) -> Generator[None, None, None]:
-    """Ensure all pending file close operations complete during test teardown."""
-    yield
-    if payload._CLOSE_FUTURES:
-        # Only wait for futures from the current loop
-        loop_futures = [f for f in payload._CLOSE_FUTURES if f.get_loop() is loop]
-        if loop_futures:
-            loop.run_until_complete(
-                asyncio.gather(*loop_futures, return_exceptions=True)
-            )

tests/test_client_functional.py

@@ -18,6 +18,7 @@
     Awaitable,
     Callable,
     Dict,
+    Generator,
     List,
     NoReturn,
     Optional,
@@ -33,7 +34,7 @@
 from yarl import URL
 
 import aiohttp
-from aiohttp import Fingerprint, ServerFingerprintMismatch, hdrs, web
+from aiohttp import Fingerprint, ServerFingerprintMismatch, hdrs, payload, web
 from aiohttp.abc import AbstractResolver, ResolveResult
 from aiohttp.client_exceptions import (
     ClientResponseError,
@@ -53,11 +54,19 @@
 from aiohttp.typedefs import Handler, Query
 
 
-@pytest.fixture(autouse=True)
-def cleanup(
-    cleanup_payload_pending_file_closes: None,
-) -> None:
+@pytest.fixture()
+def cleanup_payload_pending_file_closes(
+    loop: asyncio.AbstractEventLoop,
+) -> Generator[None, None, None]:
     """Ensure all pending file close operations complete during test teardown."""
+    yield
+    if payload._CLOSE_FUTURES:
+        # Only wait for futures from the current loop
+        loop_futures = [f for f in payload._CLOSE_FUTURES if f.get_loop() is loop]
+        if loop_futures:
+            loop.run_until_complete(
+                asyncio.gather(*loop_futures, return_exceptions=True)
+            )
 
 
 @pytest.fixture

tests/test_payload.py

@@ -1,8 +1,9 @@
 import array
+import asyncio
 import io
 import unittest.mock
 from io import StringIO
-from typing import AsyncIterator, Iterator, List, Optional, Union
+from typing import AsyncIterator, Generator, Iterator, List, Optional, Union
 
 import pytest
 from multidict import CIMultiDict
@@ -11,11 +12,19 @@
 from aiohttp.abc import AbstractStreamWriter
 
 
-@pytest.fixture(autouse=True)
-def cleanup(
-    cleanup_payload_pending_file_closes: None,
-) -> None:
+@pytest.fixture()
+def cleanup_payload_pending_file_closes(
+    loop: asyncio.AbstractEventLoop,
+) -> Generator[None, None, None]:
     """Ensure all pending file close operations complete during test teardown."""
+    yield
+    if payload._CLOSE_FUTURES:
+        # Only wait for futures from the current loop
+        loop_futures = [f for f in payload._CLOSE_FUTURES if f.get_loop() is loop]
+        if loop_futures:
+            loop.run_until_complete(
+                asyncio.gather(*loop_futures, return_exceptions=True)
+            )
 
 
 @pytest.fixture