Move ConcurrentRunner into helpers.py

Author: NoahStapp

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

test/asynchronous/utils_spec_runner.py

@@ -18,11 +18,11 @@
 import asyncio
 import functools
 import os
-import threading
 import unittest
 from asyncio import iscoroutinefunction
 from collections import abc
 from test.asynchronous import AsyncIntegrationTest, async_client_context, client_knobs
+from test.asynchronous.helpers import ConcurrentRunner
 from test.utils import (
     CMAPListener,
     CompareType,
@@ -55,38 +55,6 @@
 
 _IS_SYNC = False
 
-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 = asyncio.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()
-
 
 class SpecRunnerTask(ConcurrentRunner):
     def __init__(self, name):

test/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:
+
+        def start(self):
+            self.task = create_task(self.run(), name=self.name)
+
+        def join(self, timeout: float | None = 0):  # type: ignore[override]
+            if self.task is not None:
+                asyncio.wait([self.task], timeout=timeout)
+
+        def is_alive(self):
+            return not self.stopped
+
+    def run(self):
+        if self.target:
+            self.target()
+        self.stopped = True

test/utils_spec_runner.py

@@ -18,11 +18,11 @@
 import asyncio
 import functools
 import os
-import threading
 import unittest
 from asyncio import iscoroutinefunction
 from collections import abc
 from test import IntegrationTest, client_context, client_knobs
+from test.helpers import ConcurrentRunner
 from test.utils import (
     CMAPListener,
     CompareType,
@@ -55,38 +55,6 @@
 
 _IS_SYNC = True
 
-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:
-
-        def start(self):
-            self.task = asyncio.create_task(self.run(), name=self.name)
-
-        def join(self, timeout: float | None = 0):  # type: ignore[override]
-            if self.task is not None:
-                asyncio.wait([self.task], timeout=timeout)
-
-        def is_alive(self):
-            return not self.stopped
-
-    def run(self):
-        if self.target:
-            self.target()
-
 
 class SpecRunnerThread(ConcurrentRunner):
     def __init__(self, name):