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

Author: blink1073

pymongo/asynchronous/mongo_client.py

@@ -1185,7 +1185,7 @@ def __getitem__(self, name: str) -> database.AsyncDatabase[_DocumentType]:
     def __del__(self) -> None:
         """Check that this AsyncMongoClient has been closed and issue a warning if not."""
         try:
-            if not self._closed:
+            if self._opened and not self._closed:
                 warnings.warn(
                     (
                         f"Unclosed {type(self).__name__} opened at:\n{self._topology_settings._stack}"

pymongo/synchronous/mongo_client.py

@@ -1185,7 +1185,7 @@ def __getitem__(self, name: str) -> database.Database[_DocumentType]:
     def __del__(self) -> None:
         """Check that this MongoClient has been closed and issue a warning if not."""
         try:
-            if not self._closed:
+            if self._opened and not self._closed:
                 warnings.warn(
                     (
                         f"Unclosed {type(self).__name__} opened at:\n{self._topology_settings._stack}"

test/asynchronous/test_auth.py

@@ -169,7 +169,7 @@ async def test_gssapi_simple(self):
         client = AsyncMongoClient(mech_uri)
         await client[GSSAPI_DB].collection.find_one()
 
-        set_name = await client.admin.command(HelloCompat.LEGACY_CMD).get("setName")
+        set_name = async_client_context.replica_set_name
         if set_name:
             if not self.service_realm_required:
                 # Without authMechanismProperties
@@ -242,7 +242,7 @@ async def test_gssapi_threaded(self):
             thread.join()
             self.assertTrue(thread.success)
 
-        set_name = await client.admin.command(HelloCompat.LEGACY_CMD).get("setName")
+        set_name = async_client_context.replica_set_name
         if set_name:
             client = AsyncMongoClient(
                 GSSAPI_HOST,
@@ -296,7 +296,7 @@ async def test_sasl_plain(self):
         client = AsyncMongoClient(uri)
         await client.ldap.test.find_one()
 
-        set_name = await client.admin.command(HelloCompat.LEGACY_CMD).get("setName")
+        set_name = async_client_context.replica_set_name
         if set_name:
             client = AsyncMongoClient(
                 SASL_HOST,

test/test_auth.py

@@ -169,7 +169,7 @@ def test_gssapi_simple(self):
         client = MongoClient(mech_uri)
         client[GSSAPI_DB].collection.find_one()
 
-        set_name = client.admin.command(HelloCompat.LEGACY_CMD).get("setName")
+        set_name = client_context.replica_set_name
         if set_name:
             if not self.service_realm_required:
                 # Without authMechanismProperties
@@ -242,7 +242,7 @@ def test_gssapi_threaded(self):
             thread.join()
             self.assertTrue(thread.success)
 
-        set_name = client.admin.command(HelloCompat.LEGACY_CMD).get("setName")
+        set_name = client_context.replica_set_name
         if set_name:
             client = MongoClient(
                 GSSAPI_HOST,
@@ -296,7 +296,7 @@ def test_sasl_plain(self):
         client = MongoClient(uri)
         client.ldap.test.find_one()
 
-        set_name = client.admin.command(HelloCompat.LEGACY_CMD).get("setName")
+        set_name = client_context.replica_set_name
         if set_name:
             client = MongoClient(
                 SASL_HOST,