more cleanup

Author: blink1073

test/asynchronous/test_retryable_writes.py

@@ -20,7 +20,7 @@
 import pprint
 import sys
 import threading
-from test.asynchronous.utils import async_set_fail_point
+from test.asynchronous.utils import async_set_fail_point, flaky
 
 sys.path[0:0] = [""]
 
@@ -497,6 +497,7 @@ class TestPoolPausedError(AsyncIntegrationTest):
     @async_client_context.require_failCommand_blockConnection
     @async_client_context.require_retryable_writes
     @client_knobs(heartbeat_frequency=0.05, min_heartbeat_interval=0.05)
+    @flaky  # PYTHON-5291
     async def test_pool_paused_error_is_retryable(self):
         cmap_listener = CMAPListener()
         cmd_listener = OvertCommandListener()

test/asynchronous/unified_format.py

@@ -533,11 +533,16 @@ def maybe_skip_test(self, spec):
         class_name = self.__class__.__name__.lower()
         description = spec["description"].lower()
         if "csot" in class_name:
-            if sys.platform == "win32":
-                self.skipTest("PYTHON-3522 CSOT tests run too slow on Windows")
+            # Skip tests that are too slow to run on a given platform.
+            slow_win32 = [
+                "maxtimems value in the command is less than timeoutms",
+                "non-tailable cursor lifetime remaining timeoutms applied to getmore if timeoutmode is unset",
+            ]
             slow_macos = [
                 "non-tailable cursor lifetime remaining timeoutms applied to getmore if timeoutmode is unset"
             ]
+            if sys.platform == "win32" and description in slow_win32 or "gridfs" in class_name:
+                self.skipTest("PYTHON-3522 CSOT test runs too slow on Windows")
             if sys.platform == "darwin" and description in slow_macos:
                 self.skipTest("PYTHON-3522 CSOT test runs too slow on MacOS")
             if async_client_context.storage_engine == "mmapv1":
@@ -1378,7 +1383,7 @@ async def run_scenario(self, spec, uri=None):
         # Handle flaky tests.
         flaky_tests = [
             # PYTHON-5170
-            ".*test_discovery_and_monitoring.TestUnifiedInterruptInUsePoolClear.*",
+            ".*test_discovery_and_monitoring.*",
             # PYTHON-5174
             ".*Driver_extends_timeout_while_streaming",
             # PYTHON-5315
@@ -1394,7 +1399,7 @@ 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:
+                if "csot" in func_name.lower():
                     options["max_runs"] = 3
                     options["affects_cpython_linux"] = True
                 decorator = flaky(**options)

test/test_retryable_writes.py

@@ -20,7 +20,7 @@
 import pprint
 import sys
 import threading
-from test.utils import set_fail_point
+from test.utils import flaky, set_fail_point
 
 sys.path[0:0] = [""]
 
@@ -495,6 +495,7 @@ class TestPoolPausedError(IntegrationTest):
     @client_context.require_failCommand_blockConnection
     @client_context.require_retryable_writes
     @client_knobs(heartbeat_frequency=0.05, min_heartbeat_interval=0.05)
+    @flaky  # PYTHON-5291
     def test_pool_paused_error_is_retryable(self):
         cmap_listener = CMAPListener()
         cmd_listener = OvertCommandListener()

test/unified_format.py

@@ -532,11 +532,16 @@ def maybe_skip_test(self, spec):
         class_name = self.__class__.__name__.lower()
         description = spec["description"].lower()
         if "csot" in class_name:
-            if sys.platform == "win32":
-                self.skipTest("PYTHON-3522 CSOT tests run too slow on Windows")
+            # Skip tests that are too slow to run on a given platform.
+            slow_win32 = [
+                "maxtimems value in the command is less than timeoutms",
+                "non-tailable cursor lifetime remaining timeoutms applied to getmore if timeoutmode is unset",
+            ]
             slow_macos = [
                 "non-tailable cursor lifetime remaining timeoutms applied to getmore if timeoutmode is unset"
             ]
+            if sys.platform == "win32" and description in slow_win32 or "gridfs" in class_name:
+                self.skipTest("PYTHON-3522 CSOT test runs too slow on Windows")
             if sys.platform == "darwin" and description in slow_macos:
                 self.skipTest("PYTHON-3522 CSOT test runs too slow on MacOS")
             if client_context.storage_engine == "mmapv1":
@@ -1365,7 +1370,7 @@ def run_scenario(self, spec, uri=None):
         # Handle flaky tests.
         flaky_tests = [
             # PYTHON-5170
-            ".*test_discovery_and_monitoring.TestUnifiedInterruptInUsePoolClear.*",
+            ".*test_discovery_and_monitoring.*",
             # PYTHON-5174
             ".*Driver_extends_timeout_while_streaming",
             # PYTHON-5315
@@ -1381,7 +1386,7 @@ 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:
+                if "csot" in func_name.lower():
                     options["max_runs"] = 3
                     options["affects_cpython_linux"] = True
                 decorator = flaky(**options)