From d99020b0e745d01a2e100bf3a2a6125433c9b1ed Mon Sep 17 00:00:00 2001
From: Tomer Nosrati <tomer.nosrati@gmail.com>
Date: Tue, 17 Sep 2024 22:23:59 +0300
Subject: [PATCH] Relaxed flaky tests mechanism

---
 .github/workflows/examples.yml       | 16 ++++++++--------
 .github/workflows/python-package.yml |  4 ++--
 tox.ini                              |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index 45790eea..72df9518 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -96,7 +96,7 @@ jobs:
         working-directory: examples/myworker
         timeout-minutes: 10
         run: |
-          pytest -xsv tests --reruns 3 --reruns-delay 10 --rerun-except AssertionError
+          pytest -xsv tests --reruns 3 --reruns-delay 10
 
   range:
     runs-on: ${{ matrix.os }}
@@ -130,7 +130,7 @@ jobs:
         working-directory: examples/range
         timeout-minutes: 30
         run: |
-          pytest -xsv tests --reruns 3 --reruns-delay 10 --rerun-except AssertionError
+          pytest -xsv tests --reruns 3 --reruns-delay 10
 
   rabbitmq_management:
     runs-on: ${{ matrix.os }}
@@ -164,7 +164,7 @@ jobs:
         working-directory: examples/rabbitmq_management
         timeout-minutes: 10
         run: |
-          pytest -xsv tests --reruns 3 --reruns-delay 10 --rerun-except AssertionError
+          pytest -xsv tests --reruns 3 --reruns-delay 10
 
   django:
     runs-on: ${{ matrix.os }}
@@ -204,7 +204,7 @@ jobs:
         timeout-minutes: 10
         run: |
           export DJANGO_SETTINGS_MODULE=proj.settings
-          pytest -xsv tests --reruns 3 --reruns-delay 10 --rerun-except AssertionError
+          pytest -xsv tests --reruns 3 --reruns-delay 10
 
   myutils:
     runs-on: ${{ matrix.os }}
@@ -238,7 +238,7 @@ jobs:
         working-directory: examples/myutils
         timeout-minutes: 10
         run: |
-          pytest -xsv tests --reruns 3 --reruns-delay 10 --rerun-except AssertionError
+          pytest -xsv tests --reruns 3 --reruns-delay 10
 
   worker_pool:
     runs-on: ${{ matrix.os }}
@@ -272,7 +272,7 @@ jobs:
         working-directory: examples/worker_pool
         timeout-minutes: 10
         run: |
-          pytest -xsv tests --reruns 3 --reruns-delay 10 --rerun-except AssertionError
+          pytest -xsv tests --reruns 3 --reruns-delay 10
 
   hybrid_setup:
     runs-on: ${{ matrix.os }}
@@ -306,7 +306,7 @@ jobs:
         working-directory: examples/hybrid_setup
         timeout-minutes: 10
         run: |
-          pytest -xsv tests --reruns 5 --reruns-delay 10 --rerun-except AssertionError
+          pytest -xsv tests --reruns 5 --reruns-delay 10
 
   vhost:
     runs-on: ${{ matrix.os }}
@@ -340,4 +340,4 @@ jobs:
         working-directory: examples/vhost
         timeout-minutes: 10
         run: |
-          pytest -xsv tests --reruns 3 --reruns-delay 10 --rerun-except AssertionError
+          pytest -xsv tests --reruns 3 --reruns-delay 10
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 92e79d7f..aa64faaf 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -122,7 +122,7 @@ jobs:
       - name: Run tox for "${{ matrix.python-version }}-integration"
         timeout-minutes: 20
         run: |
-          tox --verbose --verbose -e "${{ matrix.python-version }}-integration" -- -n auto --reruns 5 --rerun-except AssertionError
+          tox --verbose --verbose -e "${{ matrix.python-version }}-integration" -- -n auto --reruns 5
 
   Smoke:
     needs:
@@ -167,4 +167,4 @@ jobs:
       - name: Run tox for "${{ matrix.python-version }}-smoke"
         timeout-minutes: 30
         run: |
-          tox --verbose --verbose -e "${{ matrix.python-version }}-smoke" -- -n auto --reruns 5 --rerun-except AssertionError
+          tox --verbose --verbose -e "${{ matrix.python-version }}-smoke" -- -n auto --reruns 5
diff --git a/tox.ini b/tox.ini
index ea5af552..b2a1aaff 100644
--- a/tox.ini
+++ b/tox.ini
@@ -55,7 +55,7 @@ commands_pre =
 commands =
     poetry run pytest tests --exitfirst \
     -n auto --dist=loadscope \
-    --reruns 3 --reruns-delay 5 --rerun-except AssertionError \
+    --reruns 3 --reruns-delay 5 \
     {posargs}
 
 [testenv:parallel]
@@ -68,7 +68,7 @@ commands_pre =
 commands =
     tox -e py312-unit,py312-integration,py312-smoke -p auto -o -- --exitfirst \
     -n auto --dist=loadscope \
-    --reruns 3 --reruns-delay 10 --rerun-except AssertionError \
+    --reruns 3 --reruns-delay 10 \
     {posargs}
 
 [testenv:mypy]