Tests: Replace broken flaky with pytest-rerunfailures

.github/workflows/tests.yml

@@ -38,7 +38,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install flake8 pytest pytest-asyncio
+        python -m pip install flake8
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
         if [ -f ./tests/requirements.txt ]; then pip install -r ./tests/requirements.txt; fi
     - name: Lint with flake8

packages/opal-client/opal_client/tests/data_updater_test.py

@@ -11,7 +11,6 @@
 import uvicorn
 from aiohttp import ClientSession
 from fastapi_websocket_pubsub import PubSubClient
-from flaky import flaky
 from pydantic.json import pydantic_encoder
 
 # Add parent path to use local src as package for tests
@@ -161,7 +160,7 @@ async def run():
     asyncio.run(run())
 
 
-@flaky
+@pytest.mark.flaky(reruns=1)
 @pytest.mark.asyncio
 async def test_data_updater(server):
     """Disable auto-update on connect (fetch_on_connect=False) Connect to OPAL-

packages/opal-common/opal_common/fetcher/tests/http_fetch_test.py

@@ -15,7 +15,6 @@
 import pytest
 import uvicorn
 from fastapi import Depends, FastAPI, Header, HTTPException
-from flaky import flaky
 from opal_common.fetcher import FetchingEngine
 from opal_common.fetcher.providers.http_fetch_provider import HttpFetcherConfig
 
@@ -124,7 +123,7 @@ async def callback(data):
         assert got_data_event.is_set()
 
 
-@flaky
+@pytest.mark.flaky(reruns=1)
 @pytest.mark.asyncio
 async def test_external_http_get():
     """Test simple http get on external (https://freegeoip.app/) site Checking

packages/opal-server/opal_server/tests/policy_repo_webhook_test.py

@@ -11,7 +11,6 @@
 from aiohttp import ClientSession
 from fastapi import Depends
 from fastapi_websocket_pubsub import PubSubClient
-from flaky import flaky
 from opal_common.schemas.webhook import GitWebhookRequestParams
 from opal_common.tests.test_utils import wait_for_server
 from opal_server.policy.webhook.api import get_webhook_router, is_matching_webhook_url

requirements.txt

@@ -4,7 +4,7 @@
 ipython
 pytest
 pytest-asyncio
-flaky
+pytest-rerunfailures
 wheel
 twine
 setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability