Merge branch 'master' into PYTHON-4842

Author: NoahStapp

test/asynchronous/test_encryption.py

@@ -693,6 +693,11 @@ def maybe_skip_scenario(self, test):
                 self.skipTest("PYTHON-3706 flaky test on Windows/macOS")
             if "type=symbol" in desc:
                 self.skipTest("PyMongo does not support the symbol type")
+            if (
+                "timeoutms applied to listcollections to get collection schema" in desc
+                and not _IS_SYNC
+            ):
+                self.skipTest("PYTHON-4844 flaky test on async")
 
         def setup_scenario(self, scenario_def):
             """Override a test's setup."""

test/test_encryption.py

@@ -691,6 +691,11 @@ def maybe_skip_scenario(self, test):
                 self.skipTest("PYTHON-3706 flaky test on Windows/macOS")
             if "type=symbol" in desc:
                 self.skipTest("PyMongo does not support the symbol type")
+            if (
+                "timeoutms applied to listcollections to get collection schema" in desc
+                and not _IS_SYNC
+            ):
+                self.skipTest("PYTHON-4844 flaky test on async")
 
         def setup_scenario(self, scenario_def):
             """Override a test's setup."""