Run xdist tests runs with -n auto flag - closes #1081

ClearcodeHQ · Feb 10, 2025 · 0ec6f5c · 0ec6f5c
1 parent aff3d56
commit 0ec6f5c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/dockerised-postgres.yml b/.github/workflows/dockerised-postgres.yml
@@ -57,7 +57,7 @@ jobs:
         uses: fizyk/actions-reuse/.github/actions/[email protected]
         with:
           python-version: ${{ matrix.python-version }}
-          command: pytest -n 0 -k docker --postgresql-host=localhost --postgresql-port 5433 --postgresql-password=postgres --cov-report=xml:coverage-docker.xml
+          command: pytest -n 0 --max-worker-restart 0 -k docker --postgresql-host=localhost --postgresql-port 5433 --postgresql-password=postgres --cov-report=xml:coverage-docker.xml
       - name: Upload coverage to Codecov
         uses: codecov/[email protected]
         with:

diff --git a/.github/workflows/single-postgres.yml b/.github/workflows/single-postgres.yml
@@ -56,12 +56,12 @@ jobs:
         uses: fizyk/actions-reuse/.github/actions/[email protected]
         with:
           python-version: ${{ matrix.python-version }}
-          command: py.test -svv -n 0 --postgresql-exec="/usr/lib/postgresql/${{ inputs.postgresql }}/bin/pg_ctl" -k "not docker" --cov-report=xml
+          command: py.test -svv -p no:xdist --postgresql-exec="/usr/lib/postgresql/${{ inputs.postgresql }}/bin/pg_ctl" -k "not docker" --cov-report=xml
       - name: Run xdist test
         uses: fizyk/actions-reuse/.github/actions/[email protected]
         with:
           python-version: ${{ matrix.python-version }}
-          command: py.test -n 1 --postgresql-exec="/usr/lib/postgresql/${{ inputs.postgresql }}/bin/pg_ctl" -k "not docker" --cov-report=xml:coverage-xdist.xml
+          command: py.test -n auto --max-worker-restart 0 --postgresql-exec="/usr/lib/postgresql/${{ inputs.postgresql }}/bin/pg_ctl" -k "not docker" --cov-report=xml:coverage-xdist.xml
       - uses: actions/upload-artifact@v4
         if: failure()
         with:

diff --git a/newsfragments/1081.misc.rst b/newsfragments/1081.misc.rst
@@ -0,0 +1 @@
+Run xdist test with -n auto, turn off xdist for xdist-less runs
diff --git a/pyproject.toml b/pyproject.toml
@@ -58,7 +58,7 @@ namespaces = false
 
 [tool.pytest.ini_options]
 xfail_strict=true
-addopts = "--max-worker-restart=0 --showlocals --verbose --cov"
+addopts = "--showlocals --verbose --cov"
 testpaths = "tests"
 pytester_example_dir = "tests/examples"
 norecursedirs = "examples"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Run xdist test with -n auto, turn off xdist for xdist-less runs