Re-introduce pytest-xdist in supported envs (#5431)

Co-authored-by: J. Nick Koston <[email protected]>
(cherry picked from commit 751c3c4)

Author: webknjaz

.github/workflows/ci-cd.yml

@@ -206,14 +206,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:
@@ -278,7 +279,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

@@ -1,8 +1,8 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
 #
-#    pip-compile --allow-unsafe --output-file=requirements/constraints.txt --resolver=backtracking --strip-extras requirements/constraints.in
+#    pip-compile --allow-unsafe --output-file=requirements/constraints.txt --strip-extras requirements/constraints.in
 #
 aiodns==3.2.0 ; sys_platform == "linux" or sys_platform == "darwin"
     # via
@@ -38,10 +38,11 @@ build==1.0.3
     # via pip-tools
 certifi==2023.7.22
     # via requests
-cffi==1.17.0
+cffi==1.17.1
     # via
     #   cryptography
     #   pycares
+    #   pytest-codspeed
 cfgv==3.3.1
     # via pre-commit
 charset-normalizer==3.2.0
@@ -72,10 +73,16 @@ docutils==0.20.1
     # via sphinx
 exceptiongroup==1.1.2
     # via pytest
-filelock==3.3.2
-    # via virtualenv
+execnet==2.1.1
+    # via pytest-xdist
+filelock==3.16.1
+    # via
+    #   pytest-codspeed
+    #   virtualenv
 freezegun==1.5.1
-    # via -r requirements/test.in
+    # via
+    #   -r requirements/lint.in
+    #   -r requirements/test.in
 frozenlist==1.4.1
     # via
     #   -r requirements/runtime-deps.in
@@ -170,11 +177,21 @@ pytest==8.3.2
     # via
     #   -r requirements/lint.in
     #   -r requirements/test.in
+    #   pytest-codspeed
     #   pytest-cov
     #   pytest-mock
+    #   pytest-xdist
+pytest-codspeed==2.2.1
+    # 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
+    #   -r requirements/test.in
+pytest-xdist==3.6.1
     # via -r requirements/test.in
 python-dateutil==2.8.2
     # via freezegun
@@ -247,7 +264,9 @@ towncrier==23.11.0
 tqdm==4.62.3
     # via python-on-whales
 trustme==1.1.0 ; platform_machine != "i686"
-    # via -r requirements/test.in
+    # via
+    #   -r requirements/lint.in
+    #   -r requirements/test.in
 typer==0.6.1
     # via python-on-whales
 typing-extensions==4.12.2

requirements/test.in

@@ -4,10 +4,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

@@ -1,8 +1,8 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
+# This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    pip-compile --allow-unsafe --output-file=requirements/test.txt --resolver=backtracking --strip-extras requirements/test.in
+#    pip-compile --allow-unsafe --output-file=requirements/test.txt --strip-extras requirements/test.in
 #
 aiodns==3.2.0 ; sys_platform == "linux" or sys_platform == "darwin"
     # via -r requirements/runtime-deps.in
@@ -39,6 +39,8 @@ cryptography==41.0.2
     # via trustme
 exceptiongroup==1.1.2
     # via pytest
+execnet==2.1.1
+    # via pytest-xdist
 filelock==3.16.1
     # via pytest-codspeed
 freezegun==1.5.1
@@ -86,12 +88,15 @@ pytest==8.3.2
     #   pytest-codspeed
     #   pytest-cov
     #   pytest-mock
+    #   pytest-xdist
 pytest-codspeed==2.2.1
     # via -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.in
 python-dateutil==2.8.2
     # via freezegun
 python-on-whales==0.72.0

setup.cfg

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

tests/test_client_request.py

@@ -751,14 +751,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
@@ -1087,10 +1088,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()
 
 
@@ -1112,9 +1115,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)