Migrate away the unmaintained Flaky library.

metal-stack · Mar 4, 2024 · df2be22 · df2be22
1 parent 41d0754
commit df2be22
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/test/integration/deployment/integration.sh b/test/integration/deployment/integration.sh
@@ -24,7 +24,7 @@ cd -
 # FIXME: Install correct version of metal_python
 pip install --root-user-action=ignore --upgrade pip \
   coverage \
-  flaky \
+  pytest-rerunfailures \
   mock \
   metal_python \
   pytest \

diff --git a/test/integration/deployment/test/common.py b/test/integration/deployment/test/common.py
@@ -1,14 +1,6 @@
 import time
 import unittest
 
-class FlakyBackoff:
-    def __init__(self, backoff_seconds=1):
-        self._backoff_seconds = backoff_seconds
-
-    def backoff(self, *args):
-        time.sleep(self._backoff_seconds)
-        return True
-
 
 class TestinfraCommon(unittest.TestCase):
     def service_enabled_and_running(self, host, service_name):

diff --git a/test/integration/deployment/test/deployment_test.py b/test/integration/deployment/test/deployment_test.py
@@ -4,7 +4,7 @@
 from kubernetes import client, config
 import metal_python.api as metal_api
 from metal_python.driver import Driver
-from flaky import flaky
+import pytest
 import testinfra
 
 import common
@@ -48,7 +48,7 @@ def test_api_is_healthy(self):
         self.assertEqual(res.status, "healthy")
         self.assertEqual(res.message, "")
 
-    @flaky(max_runs=36, rerun_filter=common.FlakyBackoff(10).backoff)
+    @pytest.mark.flaky(reruns=36, reruns_delay=10)
     def test_switches_have_registered(self):
         api = metal_api.SwitchApi(api_client=self.driver.client)
         try: