Merge branch 'master' into async-improvements

Author: NoahStapp

test/asynchronous/test_encryption.py

@@ -379,9 +379,9 @@ async def test_use_after_close(self):
         is_greenthread_patched(),
         "gevent and eventlet do not support POSIX-style forking.",
     )
-    @unittest.skipIf("PyPy" in sys.version, "PYTHON-4738 fails often on PyPy")
     @async_client_context.require_sync
     async def test_fork(self):
+        self.skipTest("Test is flaky, PYTHON-4738")
         opts = AutoEncryptionOpts(KMS_PROVIDERS, "keyvault.datakeys")
         client = await self.async_rs_or_single_client(auto_encryption_opts=opts)
 

test/test_encryption.py

@@ -379,9 +379,9 @@ def test_use_after_close(self):
         is_greenthread_patched(),
         "gevent and eventlet do not support POSIX-style forking.",
     )
-    @unittest.skipIf("PyPy" in sys.version, "PYTHON-4738 fails often on PyPy")
     @client_context.require_sync
     def test_fork(self):
+        self.skipTest("Test is flaky, PYTHON-4738")
         opts = AutoEncryptionOpts(KMS_PROVIDERS, "keyvault.datakeys")
         client = self.rs_or_single_client(auto_encryption_opts=opts)