retrying the tests because they're flakey

Author: sleepyStick

test/asynchronous/unified_format.py

@@ -87,6 +87,7 @@
     NotPrimaryError,
     OperationFailure,
     PyMongoError,
+    _OperationCancelled,
 )
 from pymongo.monitoring import (
     CommandStartedEvent,
@@ -1388,17 +1389,20 @@ async def run_scenario(self, spec, uri=None):
         # operations during test set up and tear down.
         await self.kill_all_sessions()
 
-        if "csot" in self.id().lower():
+        if "csot" in self.id().lower() or "discovery_and_monitoring" in self.id().lower():
             # Retry CSOT tests up to 2 times to deal with flakey tests.
+            # discovery_and_monitoring tests on windows are also flakey
             attempts = 3
             for i in range(attempts):
                 try:
                     return await self._run_scenario(spec, uri)
-                except (AssertionError, OperationFailure) as exc:
+                except (AssertionError, OperationFailure, _OperationCancelled) as exc:
                     if isinstance(exc, OperationFailure) and (
                         _IS_SYNC or "failpoint" not in exc._message
                     ):
                         raise
+                    if isinstance(exc, _OperationCancelled) and _IS_SYNC:
+                        raise
                     if i < attempts - 1:
                         print(
                             f"Retrying after attempt {i+1} of {self.id()} failed with:\n"

test/unified_format.py

@@ -79,6 +79,7 @@
     NotPrimaryError,
     OperationFailure,
     PyMongoError,
+    _OperationCancelled,
 )
 from pymongo.monitoring import (
     CommandStartedEvent,
@@ -1375,17 +1376,20 @@ def run_scenario(self, spec, uri=None):
         # operations during test set up and tear down.
         self.kill_all_sessions()
 
-        if "csot" in self.id().lower():
+        if "csot" in self.id().lower() or "discovery_and_monitoring" in self.id().lower():
             # Retry CSOT tests up to 2 times to deal with flakey tests.
+            # discovery_and_monitoring tests on windows are also flakey
             attempts = 3
             for i in range(attempts):
                 try:
                     return self._run_scenario(spec, uri)
-                except (AssertionError, OperationFailure) as exc:
+                except (AssertionError, OperationFailure, _OperationCancelled) as exc:
                     if isinstance(exc, OperationFailure) and (
                         _IS_SYNC or "failpoint" not in exc._message
                     ):
                         raise
+                    if isinstance(exc, _OperationCancelled) and _IS_SYNC:
+                        raise
                     if i < attempts - 1:
                         print(
                             f"Retrying after attempt {i+1} of {self.id()} failed with:\n"