use ConcurrentRunner

Author: sleepyStick

test/asynchronous/helpers.py

@@ -395,7 +395,7 @@ def __init__(self, **kwargs):
         async def start(self):
             self.task = create_task(self.run(), name=self.name)
 
-        async def join(self, timeout: float | None = 0):  # type: ignore[override]
+        async def join(self, timeout: float | None = None):  # type: ignore[override]
             if self.task is not None:
                 await asyncio.wait([self.task], timeout=timeout)
 

test/asynchronous/test_mongos_load_balancing.py

@@ -18,6 +18,7 @@
 import asyncio
 import sys
 import threading
+from test.asynchronous.helpers import ConcurrentRunner
 
 from pymongo.operations import _Op
 
@@ -33,40 +34,22 @@
 
 _IS_SYNC = False
 
-if _IS_SYNC:
-    PARENT = threading.Thread
-else:
-    PARENT = object
 
-
-class SimpleOp(PARENT):
+class SimpleOp(ConcurrentRunner):
     def __init__(self, client):
         super().__init__()
         self.client = client
         self.passed = False
-        self.task = None
 
     async def run(self):
         await self.client.db.command("ping")
         self.passed = True  # No exception raised.
 
-    def start(self):
-        if _IS_SYNC:
-            super().start()
-        else:
-            self.task = asyncio.create_task(self.run())
-
-    async def join(self):
-        if _IS_SYNC:
-            super().join()
-        else:
-            await self.task
-
 
 async def do_simple_op(client, ntasks):
     tasks = [SimpleOp(client) for _ in range(ntasks)]
     for t in tasks:
-        t.start()
+        await t.start()
 
     for t in tasks:
         await t.join()

test/helpers.py

@@ -395,7 +395,7 @@ def __init__(self, **kwargs):
         def start(self):
             self.task = create_task(self.run(), name=self.name)
 
-        def join(self, timeout: float | None = 0):  # type: ignore[override]
+        def join(self, timeout: float | None = None):  # type: ignore[override]
             if self.task is not None:
                 asyncio.wait([self.task], timeout=timeout)
 

test/test_mongos_load_balancing.py

@@ -18,6 +18,7 @@
 import asyncio
 import sys
 import threading
+from test.helpers import ConcurrentRunner
 
 from pymongo.operations import _Op
 
@@ -33,35 +34,17 @@
 
 _IS_SYNC = True
 
-if _IS_SYNC:
-    PARENT = threading.Thread
-else:
-    PARENT = object
 
-
-class SimpleOp(PARENT):
+class SimpleOp(ConcurrentRunner):
     def __init__(self, client):
         super().__init__()
         self.client = client
         self.passed = False
-        self.task = None
 
     def run(self):
         self.client.db.command("ping")
         self.passed = True  # No exception raised.
 
-    def start(self):
-        if _IS_SYNC:
-            super().start()
-        else:
-            self.task = asyncio.create_task(self.run())
-
-    def join(self):
-        if _IS_SYNC:
-            super().join()
-        else:
-            self.task
-
 
 def do_simple_op(client, ntasks):
     tasks = [SimpleOp(client) for _ in range(ntasks)]