try again

Author: blink1073

test/asynchronous/unified_format.py

@@ -533,6 +533,14 @@ def maybe_skip_test(self, spec):
         class_name = self.__class__.__name__.lower()
         description = spec["description"].lower()
         if "csot" in class_name:
+            if "gridfs" in class_name and sys.platform == "win32":
+                self.skipTest("PYTHON-3522 CSOT GridFS tests are flaky on Windows")
+            if (
+                "Non-tailable cursor lifetime remaining timeoutMS applied to getMore if timeoutMode is unset"
+                in description
+                and sys.platform != "linux"
+            ):
+                self.skipTest("PYTHON-3522 CSOT test is flaky on Windows and MacOS")
             if async_client_context.storage_engine == "mmapv1":
                 self.skipTest(
                     "MMAPv1 does not support retryable writes which is required for CSOT tests"
@@ -1380,8 +1388,6 @@ async def run_scenario(self, spec, uri=None):
             if re.match(flaky_test, self.id()) is not None:
                 func_name = self.id()
                 options = dict(reset_func=self.asyncSetUp, func_name=func_name)
-                if "csot" in func_name:
-                    options["max_runs"] = 3
                 decorator = flaky(**options)
                 await decorator(self._run_scenario)(spec, uri)
                 return

test/asynchronous/utils.py

@@ -17,6 +17,7 @@
 
 import asyncio
 import contextlib
+import os
 import random
 import sys
 import threading  # Used in the synchronized version of this file
@@ -168,43 +169,40 @@ def flaky(
     reset_func=None,
 ):
     is_cpython_linux = sys.platform == "linux" and sys.implementation.name == "cpython"
-    if is_cpython_linux and not affects_cpython_linux:
+    disable_flaky = "DISABLE_FLAKY" in os.environ
+    if disable_flaky or (is_cpython_linux and not affects_cpython_linux):
         max_runs = 1
         min_passes = 1
 
     def decorator(target_func):
         @wraps(target_func)
         async def wrapper(*args, **kwargs):
             passes = 0
-            failure = None
             for i in range(max_runs):
                 try:
                     result = await target_func(*args, **kwargs)
                     passes += 1
                     if passes == min_passes:
                         return result
                 except Exception as e:
-                    failure = e
-                    await asyncio.sleep(delay)
-                if failure is not None and i < max_runs - 1:
+                    if i == max_runs - 1:
+                        raise e
                     print(
                         f"Retrying after attempt {i+1} of {func_name or target_func.__name__} failed with:\n"
                         f"{traceback.format_exc()}",
                         file=sys.stderr,
                     )
+                    await asyncio.sleep(delay)
                     if reset_func:
                         await reset_func()
-            if failure:
-                raise failure
-            raise RuntimeError(f"Only passed {passes} of {min_passes} times")
 
         return wrapper
 
-    # If `func` is callable, the decorator was used without arguments (`@flaky`)
+    # If `func` is callable, the decorator was used without arguments (`@flaky`).
     if callable(func):
         return decorator(func)
 
-    # Otherwise, return the decorator function, allowing arguments (`@flaky(max_runs=...)`)
+    # Otherwise, return the decorator function, allowing arguments (`@flaky(max_runs=...)`).
     return decorator
 
 

test/unified_format.py

@@ -532,6 +532,14 @@ def maybe_skip_test(self, spec):
         class_name = self.__class__.__name__.lower()
         description = spec["description"].lower()
         if "csot" in class_name:
+            if "gridfs" in class_name and sys.platform == "win32":
+                self.skipTest("PYTHON-3522 CSOT GridFS tests are flaky on Windows")
+            if (
+                "Non-tailable cursor lifetime remaining timeoutMS applied to getMore if timeoutMode is unset"
+                in description
+                and sys.platform != "linux"
+            ):
+                self.skipTest("PYTHON-3522 CSOT test is flaky on Windows and MacOS")
             if client_context.storage_engine == "mmapv1":
                 self.skipTest(
                     "MMAPv1 does not support retryable writes which is required for CSOT tests"
@@ -1367,8 +1375,6 @@ def run_scenario(self, spec, uri=None):
             if re.match(flaky_test, self.id()) is not None:
                 func_name = self.id()
                 options = dict(reset_func=self.setUp, func_name=func_name)
-                if "csot" in func_name:
-                    options["max_runs"] = 3
                 decorator = flaky(**options)
                 decorator(self._run_scenario)(spec, uri)
                 return

test/utils.py

@@ -17,6 +17,7 @@
 
 import asyncio
 import contextlib
+import os
 import random
 import sys
 import threading  # Used in the synchronized version of this file
@@ -166,43 +167,40 @@ def flaky(
     reset_func=None,
 ):
     is_cpython_linux = sys.platform == "linux" and sys.implementation.name == "cpython"
-    if is_cpython_linux and not affects_cpython_linux:
+    disable_flaky = "DISABLE_FLAKY" in os.environ
+    if disable_flaky or (is_cpython_linux and not affects_cpython_linux):
         max_runs = 1
         min_passes = 1
 
     def decorator(target_func):
         @wraps(target_func)
         def wrapper(*args, **kwargs):
             passes = 0
-            failure = None
             for i in range(max_runs):
                 try:
                     result = target_func(*args, **kwargs)
                     passes += 1
                     if passes == min_passes:
                         return result
                 except Exception as e:
-                    failure = e
-                    time.sleep(delay)
-                if failure is not None and i < max_runs - 1:
+                    if i == max_runs - 1:
+                        raise e
                     print(
                         f"Retrying after attempt {i+1} of {func_name or target_func.__name__} failed with:\n"
                         f"{traceback.format_exc()}",
                         file=sys.stderr,
                     )
+                    time.sleep(delay)
                     if reset_func:
                         reset_func()
-            if failure:
-                raise failure
-            raise RuntimeError(f"Only passed {passes} of {min_passes} times")
 
         return wrapper
 
-    # If `func` is callable, the decorator was used without arguments (`@flaky`)
+    # If `func` is callable, the decorator was used without arguments (`@flaky`).
     if callable(func):
         return decorator(func)
 
-    # Otherwise, return the decorator function, allowing arguments (`@flaky(max_runs=...)`)
+    # Otherwise, return the decorator function, allowing arguments (`@flaky(max_runs=...)`).
     return decorator