handle more flakiness

Author: blink1073

test/asynchronous/test_client_bulk_write.py

@@ -627,7 +627,7 @@ async def asyncSetUp(self):
 
     @async_client_context.require_version_min(8, 0, 0, -24)
     @async_client_context.require_failCommand_fail_point
-    @flaky
+    @flaky(max_runs=3, affects_cpython_linux=True)
     async def test_timeout_in_multi_batch_bulk_write(self):
         _OVERHEAD = 500
 

test/asynchronous/test_encryption.py

@@ -32,6 +32,7 @@
 import warnings
 from test.asynchronous import AsyncIntegrationTest, AsyncPyMongoTestCase, async_client_context
 from test.asynchronous.test_bulk import AsyncBulkTestBase
+from test.asynchronous.utils import flaky
 from test.asynchronous.utils_spec_runner import AsyncSpecRunner, AsyncSpecTestCreator
 from threading import Thread
 from typing import Any, Dict, Mapping, Optional
@@ -3275,6 +3276,8 @@ async def asyncSetUp(self):
             OPTS,
         )
 
+    # PYTHON-4982
+    @flaky
     async def test_01_simple_create(self):
         coll, _ = await self.client_encryption.create_encrypted_collection(
             database=self.db,
@@ -3491,6 +3494,8 @@ async def asyncSetUp(self) -> None:
         hello = await self.mongocryptd_client.db.command("hello")
         self.assertNotIn("logicalSessionTimeoutMinutes", hello)
 
+    # PYTHON-4982
+    @flaky
     async def test_implicit_session_ignored_when_unsupported(self):
         self.listener.reset()
         with self.assertRaises(OperationFailure):

test/asynchronous/unified_format.py

@@ -537,16 +537,12 @@ def maybe_skip_test(self, spec):
             slow_win32 = [
                 "maxtimems value in the command is less than timeoutms",
                 "non-tailable cursor lifetime remaining timeoutms applied to getmore if timeoutmode is unset",
-                "maxtimems applied to update during a rename",
-                "maxtimems applied to find to get chunks",
-                "maxtimems applied to find to get files document",
-                "maxtimems applied to find command",
             ]
             slow_macos = [
                 "non-tailable cursor lifetime remaining timeoutms applied to getmore if timeoutmode is unset"
             ]
-            if sys.platform == "win32" and description in slow_win32:
-                self.skipTest("PYTHON-3522 CSOT test run too slow on Windows")
+            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":
@@ -1390,6 +1386,13 @@ async def run_scenario(self, spec, uri=None):
             ".*test_discovery_and_monitoring.TestUnifiedInterruptInUsePoolClear.*",
             # PYTHON-5174
             ".*Driver_extends_timeout_while_streaming",
+            # PYTHON-5315
+            ".*TestSrvPolling.test_recover_from_initially_.*",
+            # PYTHON-4987
+            ".*UnknownTransactionCommitResult_labels_to_connection_errors",
+            # PYTHON-3689
+            ".*TestProse.test_load_balancing",
+            # PYTHON-3522
             ".*csot.*",
         ]
         for flaky_test in flaky_tests:
@@ -1398,6 +1401,7 @@ async def run_scenario(self, spec, uri=None):
                 options = dict(reset_func=self.asyncSetUp, func_name=func_name)
                 if "csot" in func_name:
                     options["max_runs"] = 3
+                    options["affects_cpython_linux"] = True
                 decorator = flaky(**options)
                 await decorator(self._run_scenario)(spec, uri)
                 return

test/test_client_bulk_write.py

@@ -623,7 +623,7 @@ def setUp(self):
 
     @client_context.require_version_min(8, 0, 0, -24)
     @client_context.require_failCommand_fail_point
-    @flaky
+    @flaky(max_runs=3, affects_cpython_linux=True)
     def test_timeout_in_multi_batch_bulk_write(self):
         _OVERHEAD = 500
 

test/test_encryption.py

@@ -32,6 +32,7 @@
 import warnings
 from test import IntegrationTest, PyMongoTestCase, client_context
 from test.test_bulk import BulkTestBase
+from test.utils import flaky
 from test.utils_spec_runner import SpecRunner, SpecTestCreator
 from threading import Thread
 from typing import Any, Dict, Mapping, Optional
@@ -3257,6 +3258,8 @@ def setUp(self):
             OPTS,
         )
 
+    # PYTHON-4982
+    @flaky
     def test_01_simple_create(self):
         coll, _ = self.client_encryption.create_encrypted_collection(
             database=self.db,
@@ -3473,6 +3476,8 @@ def setUp(self) -> None:
         hello = self.mongocryptd_client.db.command("hello")
         self.assertNotIn("logicalSessionTimeoutMinutes", hello)
 
+    # PYTHON-4982
+    @flaky
     def test_implicit_session_ignored_when_unsupported(self):
         self.listener.reset()
         with self.assertRaises(OperationFailure):

test/test_topology.py

@@ -23,7 +23,7 @@
 
 from test import client_knobs, unittest
 from test.pymongo_mocks import DummyMonitor
-from test.utils import MockPool
+from test.utils import MockPool, flaky
 from test.utils_shared import wait_until
 
 from bson.objectid import ObjectId
@@ -750,6 +750,8 @@ def get_primary():
 class TestTopologyErrors(TopologyTest):
     # Errors when calling hello.
 
+    # PYTHON-5366
+    @flaky
     def test_pool_reset(self):
         # hello succeeds at first, then always raises socket error.
         hello_count = [0]

test/unified_format.py

@@ -536,16 +536,12 @@ def maybe_skip_test(self, spec):
             slow_win32 = [
                 "maxtimems value in the command is less than timeoutms",
                 "non-tailable cursor lifetime remaining timeoutms applied to getmore if timeoutmode is unset",
-                "maxtimems applied to update during a rename",
-                "maxtimems applied to find to get chunks",
-                "maxtimems applied to find to get files document",
-                "maxtimems applied to find command",
             ]
             slow_macos = [
                 "non-tailable cursor lifetime remaining timeoutms applied to getmore if timeoutmode is unset"
             ]
-            if sys.platform == "win32" and description in slow_win32:
-                self.skipTest("PYTHON-3522 CSOT test run too slow on Windows")
+            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":
@@ -1377,6 +1373,13 @@ def run_scenario(self, spec, uri=None):
             ".*test_discovery_and_monitoring.TestUnifiedInterruptInUsePoolClear.*",
             # PYTHON-5174
             ".*Driver_extends_timeout_while_streaming",
+            # PYTHON-5315
+            ".*TestSrvPolling.test_recover_from_initially_.*",
+            # PYTHON-4987
+            ".*UnknownTransactionCommitResult_labels_to_connection_errors",
+            # PYTHON-3689
+            ".*TestProse.test_load_balancing",
+            # PYTHON-3522
             ".*csot.*",
         ]
         for flaky_test in flaky_tests:
@@ -1385,6 +1388,7 @@ def run_scenario(self, spec, uri=None):
                 options = dict(reset_func=self.setUp, func_name=func_name)
                 if "csot" in func_name:
                     options["max_runs"] = 3
+                    options["affects_cpython_linux"] = True
                 decorator = flaky(**options)
                 decorator(self._run_scenario)(spec, uri)
                 return