Merge branch 'master' into PYTHON-5100

Author: sleepyStick

test/asynchronous/__init__.py

@@ -1176,15 +1176,15 @@ def unmanaged_simple_client(
 
     async def disable_replication(self, client):
         """Disable replication on all secondaries."""
-        for h, p in client.secondaries:
+        for h, p in await client.secondaries:
             secondary = await self.async_single_client(h, p)
-            secondary.admin.command("configureFailPoint", "stopReplProducer", mode="alwaysOn")
+            await secondary.admin.command("configureFailPoint", "stopReplProducer", mode="alwaysOn")
 
     async def enable_replication(self, client):
         """Enable replication on all secondaries."""
-        for h, p in client.secondaries:
+        for h, p in await client.secondaries:
             secondary = await self.async_single_client(h, p)
-            secondary.admin.command("configureFailPoint", "stopReplProducer", mode="off")
+            await secondary.admin.command("configureFailPoint", "stopReplProducer", mode="off")
 
 
 class AsyncUnitTest(AsyncPyMongoTestCase):

test/asynchronous/helpers.py

@@ -15,6 +15,7 @@
 """Shared constants and helper methods for pymongo, bson, and gridfs test suites."""
 from __future__ import annotations
 
+import asyncio
 import base64
 import gc
 import multiprocessing
@@ -30,6 +31,8 @@
 import warnings
 from asyncio import iscoroutinefunction
 
+from pymongo._asyncio_task import create_task
+
 try:
     import ipaddress
 
@@ -369,3 +372,37 @@ def disable(self):
             os.environ.pop("SSL_CERT_FILE")
         else:
             os.environ["SSL_CERT_FILE"] = self.original_certs
+
+
+if _IS_SYNC:
+    PARENT = threading.Thread
+else:
+    PARENT = object
+
+
+class ConcurrentRunner(PARENT):
+    def __init__(self, name, *args, **kwargs):
+        if _IS_SYNC:
+            super().__init__(*args, **kwargs)
+        self.name = name
+        self.stopped = False
+        self.task = None
+        if "target" in kwargs:
+            self.target = kwargs["target"]
+
+    if not _IS_SYNC:
+
+        async def start(self):
+            self.task = create_task(self.run(), name=self.name)
+
+        async def join(self, timeout: float | None = 0):  # type: ignore[override]
+            if self.task is not None:
+                await asyncio.wait([self.task], timeout=timeout)
+
+        def is_alive(self):
+            return not self.stopped
+
+    async def run(self):
+        if self.target:
+            await self.target()
+        self.stopped = True