Revert "Fix test failures (mongodb#1973)"

This reverts commit 2d98fb1.

Author: NoahStapp

test/asynchronous/test_auth_spec.py

@@ -25,7 +25,7 @@
 sys.path[0:0] = [""]
 
 from test import unittest
-from test.asynchronous.unified_format import generate_test_classes
+from test.unified_format import generate_test_classes
 
 from pymongo import AsyncMongoClient
 from pymongo.asynchronous.auth_oidc import OIDCCallback

test/asynchronous/test_change_stream.py

@@ -35,7 +35,7 @@
     async_client_context,
     unittest,
 )
-from test.asynchronous.unified_format import generate_test_classes
+from test.unified_format import generate_test_classes
 from test.utils import (
     AllowListEventListener,
     EventListener,

test/asynchronous/test_connection_logging.py

@@ -22,7 +22,7 @@
 sys.path[0:0] = [""]
 
 from test import unittest
-from test.asynchronous.unified_format import generate_test_classes
+from test.unified_format import generate_test_classes
 
 _IS_SYNC = False
 

test/asynchronous/test_create_entities.py

@@ -56,9 +56,6 @@ async def test_store_events_as_entities(self):
         self.assertGreater(len(final_entity_map["events1"]), 0)
         for event in final_entity_map["events1"]:
             self.assertIn("PoolCreatedEvent", event["name"])
-        if self.scenario_runner.mongos_clients:
-            for client in self.scenario_runner.mongos_clients:
-                await client.close()
 
     async def test_store_all_others_as_entities(self):
         self.scenario_runner = UnifiedSpecTestMixinV1()
@@ -125,9 +122,6 @@ async def test_store_all_others_as_entities(self):
         self.assertEqual(entity_map["failures"], [])
         self.assertEqual(entity_map["successes"], 2)
         self.assertEqual(entity_map["iterations"], 5)
-        if self.scenario_runner.mongos_clients:
-            for client in self.scenario_runner.mongos_clients:
-                await client.close()
 
 
 if __name__ == "__main__":

test/asynchronous/test_crud_unified.py

@@ -22,7 +22,7 @@
 sys.path[0:0] = [""]
 
 from test import unittest
-from test.asynchronous.unified_format import generate_test_classes
+from test.unified_format import generate_test_classes
 
 _IS_SYNC = False
 

test/asynchronous/test_encryption.py

@@ -46,7 +46,6 @@
     unittest,
 )
 from test.asynchronous.test_bulk import AsyncBulkTestBase
-from test.asynchronous.unified_format import generate_test_classes
 from test.asynchronous.utils_spec_runner import AsyncSpecRunner
 from test.helpers import (
     AWS_CREDS,
@@ -57,6 +56,7 @@
     KMIP_CREDS,
     LOCAL_MASTER_KEY,
 )
+from test.unified_format import generate_test_classes
 from test.utils import (
     AllowListEventListener,
     OvertCommandListener,

test/asynchronous/unified_format.py

@@ -304,6 +304,7 @@ async def _create_entity(self, entity_spec, uri=None):
                 kwargs["h"] = uri
             client = await self.test.async_rs_or_single_client(**kwargs)
             self[spec["id"]] = client
+            self.test.addAsyncCleanup(client.close)
             return
         elif entity_type == "database":
             client = self[spec["client"]]
@@ -1036,6 +1037,7 @@ async def _testOperation_targetedFailPoint(self, spec):
             )
 
         client = await self.async_single_client("{}:{}".format(*session._pinned_address))
+        self.addAsyncCleanup(client.close)
         await self.__set_fail_point(client=client, command_args=spec["failPoint"])
 
     async def _testOperation_createEntities(self, spec):

test/test_create_entities.py

@@ -56,9 +56,6 @@ def test_store_events_as_entities(self):
         self.assertGreater(len(final_entity_map["events1"]), 0)
         for event in final_entity_map["events1"]:
             self.assertIn("PoolCreatedEvent", event["name"])
-        if self.scenario_runner.mongos_clients:
-            for client in self.scenario_runner.mongos_clients:
-                client.close()
 
     def test_store_all_others_as_entities(self):
         self.scenario_runner = UnifiedSpecTestMixinV1()
@@ -125,9 +122,6 @@ def test_store_all_others_as_entities(self):
         self.assertEqual(entity_map["failures"], [])
         self.assertEqual(entity_map["successes"], 2)
         self.assertEqual(entity_map["iterations"], 5)
-        if self.scenario_runner.mongos_clients:
-            for client in self.scenario_runner.mongos_clients:
-                client.close()
 
 
 if __name__ == "__main__":

test/unified_format.py

@@ -303,6 +303,7 @@ def _create_entity(self, entity_spec, uri=None):
                 kwargs["h"] = uri
             client = self.test.rs_or_single_client(**kwargs)
             self[spec["id"]] = client
+            self.test.addCleanup(client.close)
             return
         elif entity_type == "database":
             client = self[spec["client"]]
@@ -1027,6 +1028,7 @@ def _testOperation_targetedFailPoint(self, spec):
             )
 
         client = self.single_client("{}:{}".format(*session._pinned_address))
+        self.addCleanup(client.close)
         self.__set_fail_point(client=client, command_args=spec["failPoint"])
 
     def _testOperation_createEntities(self, spec):