MOTOR-1363 - Pass correct parameter to AsyncIOMotorClientEncryption

Author: NoahStapp

pyproject.toml

@@ -103,7 +103,10 @@ filterwarnings = [
     "ignore:GridOut property 'aliases' is deprecated and will be removed in PyMongo 5.0:DeprecationWarning",
     # From older versions aiohttp.
     "ignore:\"@coroutine\" decorator is deprecated since Python 3.8:DeprecationWarning",
-    "ignore:The loop argument is deprecated since Python 3.8:DeprecationWarning"
+    "ignore:The loop argument is deprecated since Python 3.8:DeprecationWarning",
+    # TODO: Remove both of these in https://jira.mongodb.org/browse/PYTHON-4731
+    "ignore:Unclosed AsyncMongoClient*",
+    "ignore:Unclosed MongoClient*",
 ]
 
 [tool.ruff]

synchro/synchrotest.py

@@ -324,15 +324,7 @@ def want_method(method, classname):
     # https://docs.python.org/3/reference/import.html#import-hooks
     for n in [
         "pymongo",
-        "pymongo.collection",
-        "pymongo.client_session",
-        "pymongo.command_cursor",
-        "pymongo.change_stream",
-        "pymongo.cursor",
-        "pymongo.encryption",
         "pymongo.encryption_options",
-        "pymongo.mongo_client",
-        "pymongo.database",
         "pymongo.srv_resolver",
         "pymongo.synchronous.collection",
         "pymongo.synchronous.client_session",
@@ -344,7 +336,6 @@ def want_method(method, classname):
         "pymongo.synchronous.database",
         "gridfs",
         "gridfs.grid_file",
-        "gridfs.synchronous.grid_file",
     ]:
         sys.modules.pop(n)
 

test/asyncio_tests/test_asyncio_collection.py

@@ -270,7 +270,7 @@ def test_sub_collection(self):
     @env.require_no_standalone
     @asyncio_test
     async def test_async_create_encrypted_collection(self):
-        c = self.collection
+        c = self.cx
         KMS_PROVIDERS = {"local": {"key": b"\x00" * 96}}
         self.cx.drop_database("db")
         async with AsyncIOMotorClientEncryption(
@@ -290,7 +290,7 @@ async def test_async_create_encrypted_collection(self):
     @env.require_version_min(8, 0, -1, -1)
     @asyncio_test
     async def test_async_encrypt_expression(self):
-        c = self.collection
+        c = self.cx
         KMS_PROVIDERS = {"local": {"key": b"\x00" * 96}}
         self.cx.drop_database("db")
         async with AsyncIOMotorClientEncryption(

test/asyncio_tests/test_asyncio_cursor.py

@@ -585,7 +585,7 @@ async def test_context_manager(self):
 
     @asyncio_test
     async def test_generate_keys(self):
-        c = self.collection
+        c = self.cx
         KMS_PROVIDERS = {"local": {"key": b"\x00" * 96}}
 
         async with motor_asyncio.AsyncIOMotorClientEncryption(

test/tornado_tests/test_motor_collection.py

@@ -272,7 +272,7 @@ def test_sub_collection(self):
     @gen_test
     async def test_async_create_encrypted_collection(self):
         await self.db.drop_collection("test_collection")
-        c = self.collection
+        c = self.cx
         KMS_PROVIDERS = {"local": {"key": b"\x00" * 96}}
         self.cx.drop_database("db")
         async with motor.MotorClientEncryption(
@@ -292,7 +292,7 @@ async def test_async_create_encrypted_collection(self):
     @env.require_version_min(8, 0, -1, -1)
     @gen_test
     async def test_async_encrypt_expression(self):
-        c = self.collection
+        c = self.cx
         KMS_PROVIDERS = {"local": {"key": b"\x00" * 96}}
         self.cx.drop_database("db")
         async with motor.MotorClientEncryption(

test/tornado_tests/test_motor_cursor.py

@@ -518,7 +518,7 @@ async def test_raw_batches(self):
 
     @gen_test
     async def test_generate_keys(self):
-        c = self.collection
+        c = self.cx
         KMS_PROVIDERS = {"local": {"key": b"\x00" * 96}}
 
         async with motor.MotorClientEncryption(