retry flakey tests

Author: sleepyStick

test/asynchronous/unified_format.py

@@ -1394,7 +1394,9 @@ async def run_scenario(self, spec, uri=None):
             for i in range(attempts):
                 try:
                     return await self._run_scenario(spec, uri)
-                except AssertionError:
+                except (AssertionError, OperationFailure) as exc:
+                    if isinstance(exc, OperationFailure) and "failpoint" not in exc._message:
+                        raise
                     if i < attempts - 1:
                         print(
                             f"Retrying after attempt {i+1} of {self.id()} failed with:\n"

test/unified_format.py

@@ -1381,7 +1381,9 @@ def run_scenario(self, spec, uri=None):
             for i in range(attempts):
                 try:
                     return self._run_scenario(spec, uri)
-                except AssertionError:
+                except (AssertionError, OperationFailure) as exc:
+                    if isinstance(exc, OperationFailure) and "failpoint" not in exc._message:
+                        raise
                     if i < attempts - 1:
                         print(
                             f"Retrying after attempt {i+1} of {self.id()} failed with:\n"