Remove now unnecessary lock from testing

Author: abrookins

redis/asyncio/client.py

@@ -1383,7 +1383,9 @@ async def _disconnect_reset_raise(self, conn, error):
         # indicates the user should retry this transaction.
         if self.watching:
             await self.aclose()
-            raise
+            raise WatchError(
+                "A ConnectionError occurred on while watching one or more keys"
+            )
         # if retry_on_error is not set or the error is not one
         # of the specified error types, raise it
         if (

redis/asyncio/connection.py

@@ -1157,20 +1157,19 @@ async def disconnect(self, inuse_connections: bool = True):
         current in use, potentially by other tasks. Otherwise only disconnect
         connections that are idle in the pool.
         """
-        async with self._lock:
-            if inuse_connections:
-                connections: Iterable[AbstractConnection] = chain(
-                    self._available_connections, self._in_use_connections
-                )
-            else:
-                connections = self._available_connections
-            resp = await asyncio.gather(
-                *(connection.disconnect() for connection in connections),
-                return_exceptions=True,
+        if inuse_connections:
+            connections: Iterable[AbstractConnection] = chain(
+                self._available_connections, self._in_use_connections
             )
-            exc = next((r for r in resp if isinstance(r, BaseException)), None)
-            if exc:
-                raise exc
+        else:
+            connections = self._available_connections
+        resp = await asyncio.gather(
+            *(connection.disconnect() for connection in connections),
+            return_exceptions=True,
+        )
+        exc = next((r for r in resp if isinstance(r, BaseException)), None)
+        if exc:
+            raise exc
 
     async def aclose(self) -> None:
         """Close the pool, disconnecting all connections"""