From 0ec6f5c9d34b93982a133260915c4c8f780c27f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Grzegorz=20=C5=9Aliwi=C5=84ski?= Date: Mon, 10 Feb 2025 11:50:53 +0100 Subject: [PATCH] Run xdist tests runs with -n auto flag - closes #1081 --- .github/workflows/dockerised-postgres.yml | 2 +- .github/workflows/single-postgres.yml | 4 ++-- newsfragments/1081.misc.rst | 1 + pyproject.toml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 newsfragments/1081.misc.rst diff --git a/.github/workflows/dockerised-postgres.yml b/.github/workflows/dockerised-postgres.yml index dac0dd2c..46a4b825 100644 --- a/.github/workflows/dockerised-postgres.yml +++ b/.github/workflows/dockerised-postgres.yml @@ -57,7 +57,7 @@ jobs: uses: fizyk/actions-reuse/.github/actions/pipenv@v2.6.0 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/codecov-action@v5.3.1 with: diff --git a/.github/workflows/single-postgres.yml b/.github/workflows/single-postgres.yml index e68e0e04..c0e8ee2c 100644 --- a/.github/workflows/single-postgres.yml +++ b/.github/workflows/single-postgres.yml @@ -56,12 +56,12 @@ jobs: uses: fizyk/actions-reuse/.github/actions/pipenv@v2.6.0 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/pipenv@v2.6.0 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 new file mode 100644 index 00000000..dbe5f75f --- /dev/null +++ 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 index 991b2e5e..1b58a31b 100644 --- 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"