Merge branch 'master' of github.com:mongodb/mongo-python-driver

Author: blink1073

.evergreen/generated_configs/variants.yml

@@ -75,6 +75,8 @@ buildvariants:
     display_name: Atlas connect RHEL8
     run_on:
       - rhel87-small
+    expansions:
+      TEST_NAME: atlas_connect
     tags: [pr]
 
   # Atlas data lake tests

.evergreen/scripts/generate_config.py

@@ -425,6 +425,7 @@ def create_atlas_connect_variants():
             get_variant_name("Atlas connect", host),
             tags=["pr"],
             host=DEFAULT_HOST,
+            expansions=dict(TEST_NAME="atlas_connect"),
         )
     ]
 

.evergreen/scripts/setup_tests.py

@@ -417,7 +417,18 @@ def handle_test_env() -> None:
             run_command(f"bash {auth_aws_dir}/setup-secrets.sh")
 
     if test_name == "atlas_connect":
-        get_secrets("drivers/atlas_connect")
+        secrets = get_secrets("drivers/atlas_connect")
+
+        # Write file with Atlas X509 client certificate:
+        decoded = base64.b64decode(secrets["ATLAS_X509_DEV_CERT_BASE64"]).decode("utf8")
+        cert_file = ROOT / ".evergreen/atlas_x509_dev_client_certificate.pem"
+        with cert_file.open("w") as file:
+            file.write(decoded)
+        write_env(
+            "ATLAS_X509_DEV_WITH_CERT",
+            secrets["ATLAS_X509_DEV"] + "&tlsCertificateKeyFile=" + str(cert_file),
+        )
+
         # We do not want the default client_context to be initialized.
         write_env("DISABLE_CONTEXT")
 

.gitignore

@@ -30,6 +30,7 @@ expansion.yml
 .evergreen/scripts/test-env.sh
 specifications/
 results.json
+.evergreen/atlas_x509_dev_client_certificate.pem
 
 # Lambda temp files
 test/lambda/.aws-sam

test/asynchronous/test_cursor.py

@@ -1411,7 +1411,7 @@ async def test_to_list_length(self):
     async def test_to_list_csot_applied(self):
         client = await self.async_single_client(timeoutMS=500, w=1)
         coll = client.pymongo.test
-        # Initialize the client with a larger timeout to help make test less flakey
+        # Initialize the client with a larger timeout to help make test less flaky
         with pymongo.timeout(10):
             await coll.insert_many([{} for _ in range(5)])
         cursor = coll.find({"$where": delay(1)})
@@ -1453,7 +1453,7 @@ async def test_command_cursor_to_list_length(self):
     async def test_command_cursor_to_list_csot_applied(self):
         client = await self.async_single_client(timeoutMS=500, w=1)
         coll = client.pymongo.test
-        # Initialize the client with a larger timeout to help make test less flakey
+        # Initialize the client with a larger timeout to help make test less flaky
         with pymongo.timeout(10):
             await coll.insert_many([{} for _ in range(5)])
         fail_command = {

test/asynchronous/test_retryable_reads.py

@@ -87,7 +87,7 @@ class TestPoolPausedError(AsyncIntegrationTest):
     async def test_pool_paused_error_is_retryable(self):
         if "PyPy" in sys.version:
             # Tracked in PYTHON-3519
-            self.skipTest("Test is flakey on PyPy")
+            self.skipTest("Test is flaky on PyPy")
         cmap_listener = CMAPListener()
         cmd_listener = OvertCommandListener()
         client = await self.async_rs_or_single_client(

test/asynchronous/test_srv_polling.py

@@ -262,6 +262,7 @@ def empty_seedlist():
 
         await self._test_recover_from_initial(empty_seedlist)
 
+    @flaky(reason="PYTHON-5315")
     async def test_recover_from_initially_erroring_seedlist(self):
         def erroring_seedlist():
             raise ConfigurationError

test/atlas/test_connection.py

@@ -42,6 +42,7 @@
     "ATLAS_SRV_FREE": os.environ.get("ATLAS_SRV_FREE"),
     "ATLAS_SRV_TLS11": os.environ.get("ATLAS_SRV_TLS11"),
     "ATLAS_SRV_TLS12": os.environ.get("ATLAS_SRV_TLS12"),
+    "ATLAS_X509_DEV_WITH_CERT": os.environ.get("ATLAS_X509_DEV_WITH_CERT"),
 }
 
 
@@ -91,6 +92,9 @@ def test_srv_tls_11(self):
     def test_srv_tls_12(self):
         self.connect_srv(URIS["ATLAS_SRV_TLS12"])
 
+    def test_x509_with_cert(self):
+        self.connect(URIS["ATLAS_X509_DEV_WITH_CERT"])
+
     def test_uniqueness(self):
         """Ensure that we don't accidentally duplicate the test URIs."""
         uri_to_names = defaultdict(list)

test/test_cursor.py

@@ -1402,7 +1402,7 @@ def test_to_list_length(self):
     def test_to_list_csot_applied(self):
         client = self.single_client(timeoutMS=500, w=1)
         coll = client.pymongo.test
-        # Initialize the client with a larger timeout to help make test less flakey
+        # Initialize the client with a larger timeout to help make test less flaky
         with pymongo.timeout(10):
             coll.insert_many([{} for _ in range(5)])
         cursor = coll.find({"$where": delay(1)})
@@ -1444,7 +1444,7 @@ def test_command_cursor_to_list_length(self):
     def test_command_cursor_to_list_csot_applied(self):
         client = self.single_client(timeoutMS=500, w=1)
         coll = client.pymongo.test
-        # Initialize the client with a larger timeout to help make test less flakey
+        # Initialize the client with a larger timeout to help make test less flaky
         with pymongo.timeout(10):
             coll.insert_many([{} for _ in range(5)])
         fail_command = {

test/test_retryable_reads.py

@@ -87,7 +87,7 @@ class TestPoolPausedError(IntegrationTest):
     def test_pool_paused_error_is_retryable(self):
         if "PyPy" in sys.version:
             # Tracked in PYTHON-3519
-            self.skipTest("Test is flakey on PyPy")
+            self.skipTest("Test is flaky on PyPy")
         cmap_listener = CMAPListener()
         cmd_listener = OvertCommandListener()
         client = self.rs_or_single_client(