Fix async client unified closing

Author: NoahStapp

test/asynchronous/test_encryption.py

@@ -1495,7 +1495,6 @@ async def _test_explicit(self, expectation):
             async_client_context.client,
             OPTS,
         )
-        self.addAsyncCleanup(client_encryption.close)
 
         ciphertext = await client_encryption.encrypt(
             "string0",
@@ -1521,7 +1520,6 @@ async def _test_automatic(self, expectation_extjson, payload):
         client = await self.async_rs_or_single_client(
             auto_encryption_opts=encryption_opts, event_listeners=[insert_listener]
         )
-        self.addAsyncCleanup(client.aclose)
 
         coll = client.get_database(encrypted_db).get_collection(
             encrypted_coll, codec_options=OPTS, write_concern=WriteConcern("majority")
@@ -1545,10 +1543,10 @@ async def _test_automatic(self, expectation_extjson, payload):
 class TestAzureEncryption(AzureGCPEncryptionTestMixin, AsyncEncryptionIntegrationTest):
     @unittest.skipUnless(any(AZURE_CREDS.values()), "Azure environment credentials are not set")
     async def asyncSetUp(self):
+        await super().asyncSetUp()
         self.KMS_PROVIDER_MAP = {"azure": AZURE_CREDS}
         self.DEK = json_data(BASE, "custom", "azure-dek.json")
         self.SCHEMA_MAP = json_data(BASE, "custom", "azure-gcp-schema.json")
-        await super().asyncSetUp()
 
     async def test_explicit(self):
         return await self._test_explicit(
@@ -1570,10 +1568,10 @@ async def test_automatic(self):
 class TestGCPEncryption(AzureGCPEncryptionTestMixin, AsyncEncryptionIntegrationTest):
     @unittest.skipUnless(any(GCP_CREDS.values()), "GCP environment credentials are not set")
     async def asyncSetUp(self):
+        await super().asyncSetUp()
         self.KMS_PROVIDER_MAP = {"gcp": GCP_CREDS}
         self.DEK = json_data(BASE, "custom", "gcp-dek.json")
         self.SCHEMA_MAP = json_data(BASE, "custom", "azure-gcp-schema.json")
-        await super().asyncSetUp()
 
     async def test_explicit(self):
         return await self._test_explicit(
@@ -1595,6 +1593,7 @@ async def test_automatic(self):
 # https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.md#deadlock-tests
 class TestDeadlockProse(AsyncEncryptionIntegrationTest):
     async def asyncSetUp(self):
+        await super().asyncSetUp()
         self.client_test = await self.async_rs_or_single_client(
             maxPoolSize=1, readConcernLevel="majority", w="majority", uuidRepresentation="standard"
         )
@@ -1627,7 +1626,6 @@ async def asyncSetUp(self):
         self.ciphertext = await client_encryption.encrypt(
             "string0", Algorithm.AEAD_AES_256_CBC_HMAC_SHA_512_Deterministic, key_alt_name="local"
         )
-        await client_encryption.close()
 
         self.client_listener = OvertCommandListener()
         self.topology_listener = TopologyEventListener()
@@ -1822,6 +1820,7 @@ async def test_case_8(self):
 # https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.md#14-decryption-events
 class TestDecryptProse(AsyncEncryptionIntegrationTest):
     async def asyncSetUp(self):
+        await super().asyncSetUp()
         self.client = async_client_context.client
         await self.client.db.drop_collection("decryption_events")
         await create_key_vault(self.client.keyvault.datakeys)
@@ -2257,6 +2256,7 @@ async def test_06_named_kms_providers_apply_tls_options_kmip(self):
 # https://github.com/mongodb/specifications/blob/50e26fe/source/client-side-encryption/tests/README.md#unique-index-on-keyaltnames
 class TestUniqueIndexOnKeyAltNamesProse(AsyncEncryptionIntegrationTest):
     async def asyncSetUp(self):
+        await super().asyncSetUp()
         self.client = async_client_context.client
         await create_key_vault(self.client.keyvault.datakeys)
         kms_providers_map = {"local": {"key": LOCAL_MASTER_KEY}}
@@ -2606,8 +2606,6 @@ async def AsyncMongoClient(**kwargs):
         assert isinstance(res["encrypted_indexed"], Binary)
         assert isinstance(res["encrypted_unindexed"], Binary)
 
-        await client_encryption.close()
-
 
 # https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.md#22-range-explicit-encryption
 class TestRangeQueryProse(AsyncEncryptionIntegrationTest):

test/asynchronous/unified_format.py

@@ -499,10 +499,6 @@ async def asyncSetUp(self):
         # process file-level runOnRequirements
         run_on_spec = self.TEST_SPEC.get("runOnRequirements", [])
         if not await self.should_run_on(run_on_spec):
-            # Explicitly close async clients here
-            # to prevent leaky monitor tasks
-            if not _IS_SYNC:
-                await async_client_context.client.close()
             raise unittest.SkipTest(f"{self.__class__.__name__} runOnRequirements not satisfied")
 
         # add any special-casing for skipping tests here

test/asynchronous/utils_spec_runner.py

@@ -692,8 +692,6 @@ async def run_scenario(self, scenario_def, test):
         self.listener = listener
         self.pool_listener = pool_listener
         self.server_listener = server_listener
-        # Close the client explicitly to avoid having too many threads open.
-        self.addAsyncCleanup(client.close)
 
         # Create session0 and session1.
         sessions = {}

test/test_encryption.py

@@ -1489,7 +1489,6 @@ def _test_explicit(self, expectation):
             client_context.client,
             OPTS,
         )
-        self.addCleanup(client_encryption.close)
 
         ciphertext = client_encryption.encrypt(
             "string0",
@@ -1515,7 +1514,6 @@ def _test_automatic(self, expectation_extjson, payload):
         client = self.rs_or_single_client(
             auto_encryption_opts=encryption_opts, event_listeners=[insert_listener]
         )
-        self.addCleanup(client.close)
 
         coll = client.get_database(encrypted_db).get_collection(
             encrypted_coll, codec_options=OPTS, write_concern=WriteConcern("majority")
@@ -1539,10 +1537,10 @@ def _test_automatic(self, expectation_extjson, payload):
 class TestAzureEncryption(AzureGCPEncryptionTestMixin, EncryptionIntegrationTest):
     @unittest.skipUnless(any(AZURE_CREDS.values()), "Azure environment credentials are not set")
     def setUp(self):
+        super().setUp()
         self.KMS_PROVIDER_MAP = {"azure": AZURE_CREDS}
         self.DEK = json_data(BASE, "custom", "azure-dek.json")
         self.SCHEMA_MAP = json_data(BASE, "custom", "azure-gcp-schema.json")
-        super().setUp()
 
     def test_explicit(self):
         return self._test_explicit(
@@ -1564,10 +1562,10 @@ def test_automatic(self):
 class TestGCPEncryption(AzureGCPEncryptionTestMixin, EncryptionIntegrationTest):
     @unittest.skipUnless(any(GCP_CREDS.values()), "GCP environment credentials are not set")
     def setUp(self):
+        super().setUp()
         self.KMS_PROVIDER_MAP = {"gcp": GCP_CREDS}
         self.DEK = json_data(BASE, "custom", "gcp-dek.json")
         self.SCHEMA_MAP = json_data(BASE, "custom", "azure-gcp-schema.json")
-        super().setUp()
 
     def test_explicit(self):
         return self._test_explicit(
@@ -1589,6 +1587,7 @@ def test_automatic(self):
 # https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.md#deadlock-tests
 class TestDeadlockProse(EncryptionIntegrationTest):
     def setUp(self):
+        super().setUp()
         self.client_test = self.rs_or_single_client(
             maxPoolSize=1, readConcernLevel="majority", w="majority", uuidRepresentation="standard"
         )
@@ -1619,7 +1618,6 @@ def setUp(self):
         self.ciphertext = client_encryption.encrypt(
             "string0", Algorithm.AEAD_AES_256_CBC_HMAC_SHA_512_Deterministic, key_alt_name="local"
         )
-        client_encryption.close()
 
         self.client_listener = OvertCommandListener()
         self.topology_listener = TopologyEventListener()
@@ -1814,6 +1812,7 @@ def test_case_8(self):
 # https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.md#14-decryption-events
 class TestDecryptProse(EncryptionIntegrationTest):
     def setUp(self):
+        super().setUp()
         self.client = client_context.client
         self.client.db.drop_collection("decryption_events")
         create_key_vault(self.client.keyvault.datakeys)
@@ -2249,6 +2248,7 @@ def test_06_named_kms_providers_apply_tls_options_kmip(self):
 # https://github.com/mongodb/specifications/blob/50e26fe/source/client-side-encryption/tests/README.md#unique-index-on-keyaltnames
 class TestUniqueIndexOnKeyAltNamesProse(EncryptionIntegrationTest):
     def setUp(self):
+        super().setUp()
         self.client = client_context.client
         create_key_vault(self.client.keyvault.datakeys)
         kms_providers_map = {"local": {"key": LOCAL_MASTER_KEY}}
@@ -2590,8 +2590,6 @@ def MongoClient(**kwargs):
         assert isinstance(res["encrypted_indexed"], Binary)
         assert isinstance(res["encrypted_unindexed"], Binary)
 
-        client_encryption.close()
-
 
 # https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.md#22-range-explicit-encryption
 class TestRangeQueryProse(EncryptionIntegrationTest):

test/unified_format.py

@@ -498,10 +498,6 @@ def setUp(self):
         # process file-level runOnRequirements
         run_on_spec = self.TEST_SPEC.get("runOnRequirements", [])
         if not self.should_run_on(run_on_spec):
-            # Explicitly close async clients here
-            # to prevent leaky monitor tasks
-            if not _IS_SYNC:
-                client_context.client.close()
             raise unittest.SkipTest(f"{self.__class__.__name__} runOnRequirements not satisfied")
 
         # add any special-casing for skipping tests here

test/utils_spec_runner.py

@@ -689,8 +689,6 @@ def run_scenario(self, scenario_def, test):
         self.listener = listener
         self.pool_listener = pool_listener
         self.server_listener = server_listener
-        # Close the client explicitly to avoid having too many threads open.
-        self.addCleanup(client.close)
 
         # Create session0 and session1.
         sessions = {}