Undo unintended test/__init__.py changes

Author: NoahStapp

test/__init__.py

@@ -22,6 +22,7 @@
 import socket
 import subprocess
 import sys
+import threading
 import time
 import unittest
 import warnings
@@ -113,7 +114,7 @@ def __init__(self):
         self.default_client_options: Dict = {}
         self.sessions_enabled = False
         self.client = None  # type: ignore
-        self.conn_lock = _create_lock()
+        self.conn_lock = threading.Lock()
         self.is_data_lake = False
         self.load_balancer = TEST_LOADBALANCER
         self.serverless = TEST_SERVERLESS
@@ -697,7 +698,7 @@ def is_topology_type(self, topologies):
         if "sharded" in topologies and self.is_mongos:
             return True
         if "sharded-replicaset" in topologies and self.is_mongos:
-            shards = self.client.config.shards.find().to_list()
+            shards = client_context.client.config.shards.find().to_list()
             for shard in shards:
                 # For a 3-member RS-backed sharded cluster, shard['host']
                 # will be 'replicaName/ip1:port1,ip2:port2,ip3:port3'
@@ -871,6 +872,16 @@ def max_message_size_bytes(self):
 client_context = ClientContext()
 
 
+def reset_client_context():
+    if _IS_SYNC:
+        # sync tests don't need to reset a client context
+        return
+    elif client_context.client is not None:
+        client_context.client.close()
+        client_context.client = None
+    client_context._init_client()
+
+
 class PyMongoTestCasePyTest:
     @contextmanager
     def fail_point(self, client, command_args):
@@ -1145,6 +1156,8 @@ class IntegrationTest(PyMongoTestCase):
 
     @client_context.require_connection
     def setUp(self) -> None:
+        if not _IS_SYNC:
+            reset_client_context()
         if client_context.load_balancer and not getattr(self, "RUN_ON_LOAD_BALANCER", False):
             raise SkipTest("this test does not support load balancers")
         if client_context.serverless and not getattr(self, "RUN_ON_SERVERLESS", False):

test/asynchronous/__init__.py

@@ -22,6 +22,7 @@
 import socket
 import subprocess
 import sys
+import threading
 import time
 import unittest
 import warnings
@@ -113,7 +114,7 @@ def __init__(self):
         self.default_client_options: Dict = {}
         self.sessions_enabled = False
         self.client = None  # type: ignore
-        self.conn_lock = _async_create_lock()
+        self.conn_lock = threading.Lock()
         self.is_data_lake = False
         self.load_balancer = TEST_LOADBALANCER
         self.serverless = TEST_SERVERLESS
@@ -334,7 +335,7 @@ async def _init_client(self):
                         await mongos_client.close()
 
     async def init(self):
-        async with self.conn_lock:
+        with self.conn_lock:
             if not self.client and not self.connection_attempts:
                 await self._init_client()
 
@@ -699,7 +700,7 @@ async def is_topology_type(self, topologies):
         if "sharded" in topologies and self.is_mongos:
             return True
         if "sharded-replicaset" in topologies and self.is_mongos:
-            shards = await self.client.config.shards.find().to_list()
+            shards = await async_client_context.client.config.shards.find().to_list()
             for shard in shards:
                 # For a 3-member RS-backed sharded cluster, shard['host']
                 # will be 'replicaName/ip1:port1,ip2:port2,ip3:port3'
@@ -873,6 +874,16 @@ async def max_message_size_bytes(self):
 async_client_context = AsyncClientContext()
 
 
+async def reset_client_context():
+    if _IS_SYNC:
+        # sync tests don't need to reset a client context
+        return
+    elif async_client_context.client is not None:
+        await async_client_context.client.close()
+        async_client_context.client = None
+    await async_client_context._init_client()
+
+
 class AsyncPyMongoTestCasePyTest:
     @asynccontextmanager
     async def fail_point(self, client, command_args):
@@ -1165,6 +1176,8 @@ class AsyncIntegrationTest(AsyncPyMongoTestCase):
 
     @async_client_context.require_connection
     async def asyncSetUp(self) -> None:
+        if not _IS_SYNC:
+            await reset_client_context()
         if async_client_context.load_balancer and not getattr(self, "RUN_ON_LOAD_BALANCER", False):
             raise SkipTest("this test does not support load balancers")
         if async_client_context.serverless and not getattr(self, "RUN_ON_SERVERLESS", False):