[PR #5431/751c3c4 backport][3.11] Re-introduce pytest-xdist in supported envs (#9747)

Co-authored-by: J. Nick Koston <[email protected]>
Co-authored-by: Sviatoslav Sydorenko (Святослав Сидоренко) <[email protected]>

Author: bdraco

.github/workflows/ci-cd.yml

@@ -204,14 +204,15 @@ jobs:
         COLOR: yes
         AIOHTTP_NO_EXTENSIONS: ${{ matrix.no-extensions }}
       run: >-  # `exit 1` makes sure that the job remains red with flaky runs
-        pytest --no-cov -vvvvv --lf && exit 1
+        pytest --no-cov --numprocesses=0 -vvvvv --lf && exit 1
       shell: bash
     - name: Run dev_mode tests
       env:
         COLOR: yes
         AIOHTTP_NO_EXTENSIONS: ${{ matrix.no-extensions }}
         PIP_USER: 1
-      run: python -X dev -m pytest -m dev_mode --cov-append
+        PYTHONDEVMODE: 1
+      run: pytest -m dev_mode --cov-append --numprocesses=0
       shell: bash
     - name: Turn coverage into xml
       env:
@@ -276,7 +277,7 @@ jobs:
       uses: CodSpeedHQ/action@v3
       with:
         token: ${{ secrets.CODSPEED_TOKEN }}
-        run: python -Im pytest --no-cov -vvvvv --codspeed
+        run: python -Im pytest --no-cov --numprocesses=0 -vvvvv --codspeed
 
 
   check:  # This job does nothing and is only used for the branch protection

requirements/constraints.txt

@@ -18,6 +18,8 @@ alabaster==0.7.13
     # via sphinx
 annotated-types==0.7.0
     # via pydantic
+apipkg==1.5
+    # via execnet
 async-timeout==4.0.3 ; python_version < "3.11"
     # via
     #   -r requirements/runtime-deps.in
@@ -71,6 +73,8 @@ filelock==3.16.1
     # via
     #   pytest-codspeed
     #   virtualenv
+execnet==2.1.1
+    # via pytest-xdist
 freezegun==1.5.1
     # via
     #   -r requirements/lint.in
@@ -144,7 +148,11 @@ propcache==0.2.0
     #   -r requirements/runtime-deps.in
     #   yarl
 proxy-py==2.4.9
-    # via -r requirements/test.in
+    # via
+    #   -r requirements/lint.in
+    #   -r requirements/test.in
+py==1.11.0
+    # via pytest
 pycares==4.4.0
     # via aiodns
 pycparser==2.22
@@ -174,12 +182,25 @@ pytest==8.3.3
     #   pytest-codspeed
     #   pytest-cov
     #   pytest-mock
+    #   pytest-xdist
 pytest-codspeed==3.0.0
     # via
     #   -r requirements/lint.in
     #   -r requirements/test.in
 pytest-cov==5.0.0
     # via -r requirements/test.in
+pytest-mock==3.14.0
+    # via -r requirements/test.in
+pytest-xdist==3.6.1
+    # via -r requirements/test.txt
+python-dateutil==2.8.2
+    # via freezegun
+python-on-whales==0.71.0
+    # via
+    #   -r requirements/lint.in
+    #   -r requirements/test.in
+pytest-cov==5.0.0
+    # via -r requirements/test.in
 pytest-mock==3.14.0
     # via
     #   -r requirements/lint.in

requirements/test.in

@@ -3,10 +3,11 @@
 coverage
 freezegun
 mypy; implementation_name == "cpython"
-proxy.py >= 2.4.4rc4
+proxy.py >= 2.4.4rc5
 pytest
 pytest-cov
 pytest-mock
+pytest-xdist
 pytest_codspeed
 python-on-whales
 re-assert

requirements/test.txt

@@ -39,6 +39,8 @@ cryptography==43.0.3
     # via trustme
 exceptiongroup==1.2.2
     # via pytest
+execnet==2.1.1
+    # via pytest-xdist
 filelock==3.16.1
     # via pytest-codspeed
 freezegun==1.5.1
@@ -80,6 +82,8 @@ propcache==0.2.0
     #   yarl
 proxy-py==2.4.9
     # via -r requirements/test.in
+py==1.11.0
+    # via pytest
 pycares==4.4.0
     # via aiodns
 pycparser==2.22
@@ -97,11 +101,15 @@ pytest==8.3.3
     #   pytest-cov
     #   pytest-mock
 pytest-codspeed==3.0.0
-    # via -r requirements/test.in
+    # via
+    #   -r requirements/test.in
+    #   pytest-xdist
 pytest-cov==5.0.0
     # via -r requirements/test.in
 pytest-mock==3.14.0
     # via -r requirements/test.in
+pytest-xdist==3.6.1
+    # via -r requirements/test.in
 python-dateutil==2.9.0.post0
     # via freezegun
 python-on-whales==0.73.0

setup.cfg

@@ -125,6 +125,9 @@ exclude_lines =
 
 [tool:pytest]
 addopts =
+    # `pytest-xdist`:
+    --numprocesses=auto
+
     # show 10 slowest invocations:
     --durations=10
 

tests/test_client_request.py

@@ -744,14 +744,15 @@ async def test_urlencoded_formdata_charset(loop, conn) -> None:
         data=aiohttp.FormData({"hey": "you"}, charset="koi8-r"),
         loop=loop,
     )
-    await req.send(conn)
+    async with await req.send(conn):
+        await asyncio.sleep(0)
     assert "application/x-www-form-urlencoded; charset=koi8-r" == req.headers.get(
         "CONTENT-TYPE"
     )
     await req.close()
 
 
-async def test_post_data(loop, conn) -> None:
+async def test_post_data(loop: asyncio.AbstractEventLoop, conn: mock.Mock) -> None:
     for meth in ClientRequest.POST_METHODS:
         req = ClientRequest(
             meth, URL("http://python.org/"), data={"life": "42"}, loop=loop
@@ -1080,10 +1081,12 @@ async def throw_exc():
 
     loop.create_task(throw_exc())
 
-    await req.send(conn)
-    await req._writer
-    # assert conn.close.called
-    assert conn.protocol.set_exception.called
+    async with await req.send(conn):
+        assert req._writer is not None
+        await req._writer
+        # assert conn.close.called
+        assert conn.protocol is not None
+        assert conn.protocol.set_exception.called
     await req.close()
 
 
@@ -1105,9 +1108,10 @@ async def throw_exc():
 
     loop.create_task(throw_exc())
 
-    await req.send(conn)
-    await req._writer
-    # assert connection.close.called
+    async with await req.send(conn):
+        assert req._writer is not None
+        await req._writer
+    # assert conn.close.called
     assert conn.protocol.set_exception.called
     outer_exc = conn.protocol.set_exception.call_args[0][0]
     assert isinstance(outer_exc, ClientConnectionError)