skip more tests

Author: blink1073

test/asynchronous/test_client_bulk_write.py

@@ -630,8 +630,8 @@ async def asyncSetUp(self):
     # PYTHON-5290
     @flaky(max_runs=3, affects_cpython_linux=True)
     async def test_timeout_in_multi_batch_bulk_write(self):
-        if sys.platform == "win32":
-            self.skipTest("PYTHON-3522 CSOT test runs too slow on Windows")
+        if sys.platform != "linux":
+            self.skipTest("PYTHON-3522 CSOT test runs too slow on Windows and MacOS")
         _OVERHEAD = 500
 
         internal_client = await self.async_rs_or_single_client(timeoutMS=None)

test/asynchronous/unified_format.py

@@ -533,16 +533,11 @@ def maybe_skip_test(self, spec):
         class_name = self.__class__.__name__.lower()
         description = spec["description"].lower()
         if "csot" in class_name:
-            # 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",
-            ]
+            if sys.platform == "win32":
+                self.skipTest("PYTHON-3522 CSOT tests run too slow on Windows")
             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":

test/test_client_bulk_write.py

@@ -626,8 +626,8 @@ def setUp(self):
     # PYTHON-5290
     @flaky(max_runs=3, affects_cpython_linux=True)
     def test_timeout_in_multi_batch_bulk_write(self):
-        if sys.platform == "win32":
-            self.skipTest("PYTHON-3522 CSOT test runs too slow on Windows")
+        if sys.platform != "linux":
+            self.skipTest("PYTHON-3522 CSOT test runs too slow on Windows and MacOS")
         _OVERHEAD = 500
 
         internal_client = self.rs_or_single_client(timeoutMS=None)

test/unified_format.py

@@ -532,16 +532,11 @@ def maybe_skip_test(self, spec):
         class_name = self.__class__.__name__.lower()
         description = spec["description"].lower()
         if "csot" in class_name:
-            # 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",
-            ]
+            if sys.platform == "win32":
+                self.skipTest("PYTHON-3522 CSOT tests run too slow on Windows")
             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":