Remove unneeded test_locks

Author: NoahStapp

pymongo/asynchronous/pool.py

@@ -23,7 +23,6 @@
 import socket
 import ssl
 import sys
-import threading
 import time
 import weakref
 from typing import (
@@ -992,8 +991,8 @@ def __init__(
         self.conns: collections.deque = collections.deque()
         self.active_contexts: set[_CancellationContext] = set()
         self.lock = _async_create_lock()
-        self.size_cond = _async_create_condition(self.lock, threading.Condition)
-        self._max_connecting_cond = _async_create_condition(self.lock, threading.Condition)
+        self.size_cond = _async_create_condition(self.lock)
+        self._max_connecting_cond = _async_create_condition(self.lock)
         self.active_sockets = 0
         # Monotonically increasing connection ID required for CMAP Events.
         self.next_connection_id = 1

pymongo/asynchronous/topology.py

@@ -174,7 +174,9 @@ def __init__(self, topology_settings: TopologySettings):
         self._opened = False
         self._closed = False
         self._lock = _async_create_lock()
-        self._condition = _async_create_condition(self._lock, self._settings.condition_class)
+        self._condition = _async_create_condition(
+            self._lock, self._settings.condition_class if _IS_SYNC else None
+        )
         self._servers: dict[_Address, Server] = {}
         self._pid: Optional[int] = None
         self._max_cluster_time: Optional[ClusterTime] = None

pymongo/lock.py

@@ -42,13 +42,21 @@ def _async_create_lock() -> asyncio.Lock:
     return asyncio.Lock()
 
 
-def _create_condition(lock: threading.Lock, dummy: Any) -> threading.Condition:
+def _create_condition(
+    lock: threading.Lock, condition_class: Optional[Any] = None
+) -> threading.Condition:
     """Represents a threading.Condition."""
+    if condition_class:
+        return condition_class(lock)
     return threading.Condition(lock)
 
 
-def _async_create_condition(lock: asyncio.Lock, dummy: Any) -> asyncio.Condition:
+def _async_create_condition(
+    lock: asyncio.Lock, condition_class: Optional[Any] = None
+) -> asyncio.Condition:
     """Represents an asyncio.Condition."""
+    if condition_class:
+        return condition_class(lock)
     return asyncio.Condition(lock)
 
 

pymongo/synchronous/pool.py

@@ -23,7 +23,6 @@
 import socket
 import ssl
 import sys
-import threading
 import time
 import weakref
 from typing import (
@@ -988,8 +987,8 @@ def __init__(
         self.conns: collections.deque = collections.deque()
         self.active_contexts: set[_CancellationContext] = set()
         self.lock = _create_lock()
-        self.size_cond = _create_condition(self.lock, threading.Condition)
-        self._max_connecting_cond = _create_condition(self.lock, threading.Condition)
+        self.size_cond = _create_condition(self.lock)
+        self._max_connecting_cond = _create_condition(self.lock)
         self.active_sockets = 0
         # Monotonically increasing connection ID required for CMAP Events.
         self.next_connection_id = 1

pymongo/synchronous/topology.py

@@ -174,7 +174,9 @@ def __init__(self, topology_settings: TopologySettings):
         self._opened = False
         self._closed = False
         self._lock = _create_lock()
-        self._condition = _create_condition(self._lock, self._settings.condition_class)
+        self._condition = _create_condition(
+            self._lock, self._settings.condition_class if _IS_SYNC else None
+        )
         self._servers: dict[_Address, Server] = {}
         self._pid: Optional[int] = None
         self._max_cluster_time: Optional[ClusterTime] = None

test/__init__.py

@@ -1131,7 +1131,7 @@ class IntegrationTest(PyMongoTestCase):
 
     @client_context.require_connection
     def setUp(self) -> None:
-        if not _IS_SYNC:
+        if not _IS_SYNC and client_context.client is not None:
             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")

test/asynchronous/__init__.py

@@ -1149,7 +1149,7 @@ class AsyncIntegrationTest(AsyncPyMongoTestCase):
 
     @async_client_context.require_connection
     async def asyncSetUp(self) -> None:
-        if not _IS_SYNC:
+        if not _IS_SYNC and async_client_context.client is not None:
             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")