From 9ca1573fcf8db3cbf217ddadec87e17c1fa18568 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Fri, 25 Oct 2024 22:00:14 +0200 Subject: [PATCH] Tests: Remove pytest-rerunfailures (#4572) --- .github/workflows/tests.yml | 4 ++-- .gitlab-ci.yml | 2 +- pyproject.toml | 1 - src/setup.cfg | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 14fcfdd81..975087c75 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -70,10 +70,10 @@ jobs: run: make all compress - name: Run tests working-directory: ./src - run: PRETIX_CONFIG_FILE=tests/ci_${{ matrix.database }}.cfg py.test -n 3 -p no:sugar --cov=./ --cov-report=xml --reruns 3 tests --maxfail=100 + run: PRETIX_CONFIG_FILE=tests/ci_${{ matrix.database }}.cfg py.test -n 3 -p no:sugar --cov=./ --cov-report=xml tests --maxfail=100 - name: Run concurrency tests working-directory: ./src - run: PRETIX_CONFIG_FILE=tests/ci_${{ matrix.database }}.cfg py.test tests/concurrency_tests/ --reruns 0 --reuse-db + run: PRETIX_CONFIG_FILE=tests/ci_${{ matrix.database }}.cfg py.test tests/concurrency_tests/ --reuse-db if: matrix.database == 'postgres' - name: Upload coverage uses: codecov/codecov-action@v4 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 487eec308..b354c958f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ tests: - cd src - python manage.py check - make all compress - - PRETIX_CONFIG_FILE=tests/ci_sqlite.cfg py.test --reruns 3 -n 3 tests --maxfail=100 + - PRETIX_CONFIG_FILE=tests/ci_sqlite.cfg py.test -n 3 tests --maxfail=100 except: - pypi pypi: diff --git a/pyproject.toml b/pyproject.toml index eb7b684eb..d4600006e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -122,7 +122,6 @@ dev = [ "pytest-cov", "pytest-django==4.*", "pytest-mock==3.14.*", - "pytest-rerunfailures==14.*", "pytest-sugar", "pytest-xdist==3.6.*", "pytest==8.3.*", diff --git a/src/setup.cfg b/src/setup.cfg index a7075dd61..ac2dfb682 100644 --- a/src/setup.cfg +++ b/src/setup.cfg @@ -17,7 +17,7 @@ skip_glob = make_testdata.py,wsgi.py,bootstrap,celery_app.py,pretix/settings.py, [tool:pytest] DJANGO_SETTINGS_MODULE = tests.settings -addopts = --reruns 3 -rw +addopts = -rw asyncio_default_fixture_loop_scope = function filterwarnings = error