Fix failures

Author: NoahStapp

test/asynchronous/test_async_cancellation.py

@@ -17,7 +17,8 @@
 
 import asyncio
 import sys
-from test.utils_shared import async_get_pool, delay, one
+from test.asynchronous.utils import async_get_pool
+from test.utils_shared import delay, one
 
 sys.path[0:0] = [""]
 

test/asynchronous/test_client.py

@@ -61,7 +61,6 @@
 )
 from test.asynchronous.pymongo_mocks import AsyncMockClient
 from test.asynchronous.utils import (
-    AsyncFunctionCallRecorder,
     async_get_pool,
     async_wait_until,
     asyncAssertRaisesExactly,
@@ -70,6 +69,7 @@
 from test.utils_shared import (
     NTHREADS,
     CMAPListener,
+    FunctionCallRecorder,
     delay,
     gevent_monkey_patched,
     is_greenthread_patched,
@@ -513,7 +513,7 @@ async def test_connection_timeout_ms_propagates_to_DNS_resolver(self):
         # Patch the resolver.
         from pymongo.srv_resolver import _resolve
 
-        patched_resolver = AsyncFunctionCallRecorder(_resolve)
+        patched_resolver = FunctionCallRecorder(_resolve)
         pymongo.srv_resolver._resolve = patched_resolver
 
         def reset_resolver():

test/asynchronous/test_collection.py

@@ -21,6 +21,7 @@
 import sys
 from codecs import utf_8_decode
 from collections import defaultdict
+from test.asynchronous.utils import async_get_pool, async_is_mongos
 from typing import Any, Iterable, no_type_check
 
 from pymongo.asynchronous.database import AsyncDatabase
@@ -37,8 +38,6 @@
     IMPOSSIBLE_WRITE_CONCERN,
     EventListener,
     OvertCommandListener,
-    async_get_pool,
-    async_is_mongos,
     async_wait_until,
 )
 

test/asynchronous/test_connection_monitoring.py

@@ -20,17 +20,15 @@
 import sys
 import time
 from pathlib import Path
+from test.asynchronous.utils import async_get_pool, async_get_pools
 
 sys.path[0:0] = [""]
 
-from test.asynchronous import AsyncIntegrationTest, client_knobs, unittest
+from test.asynchronous import AsyncIntegrationTest, async_client_context, client_knobs, unittest
 from test.asynchronous.pymongo_mocks import DummyMonitor
 from test.asynchronous.utils_spec_runner import AsyncSpecTestCreator, SpecRunnerTask
 from test.utils_shared import (
     CMAPListener,
-    async_client_context,
-    async_get_pool,
-    async_get_pools,
     async_wait_until,
     camel_to_snake,
 )

test/asynchronous/test_connections_survive_primary_stepdown_spec.py

@@ -16,6 +16,7 @@
 from __future__ import annotations
 
 import sys
+from test.asynchronous.utils import async_ensure_all_connected
 
 sys.path[0:0] = [""]
 
@@ -27,7 +28,6 @@
 from test.asynchronous.helpers import async_repl_set_step_down
 from test.utils_shared import (
     CMAPListener,
-    async_ensure_all_connected,
 )
 
 from bson import SON

test/asynchronous/test_gridfs.py

@@ -28,7 +28,8 @@
 sys.path[0:0] = [""]
 
 from test.asynchronous import AsyncIntegrationTest, async_client_context, unittest
-from test.utils_shared import async_joinall, one
+from test.asynchronous.utils import async_joinall
+from test.utils_shared import one
 
 import gridfs
 from bson.binary import Binary

test/asynchronous/test_gridfs_bucket.py

@@ -29,7 +29,8 @@
 sys.path[0:0] = [""]
 
 from test.asynchronous import AsyncIntegrationTest, async_client_context, unittest
-from test.utils_shared import async_joinall, joinall, one
+from test.asynchronous.utils import async_joinall
+from test.utils_shared import one
 
 import gridfs
 from bson.binary import Binary

test/asynchronous/test_heartbeat_monitoring.py

@@ -16,11 +16,12 @@
 from __future__ import annotations
 
 import sys
+from test.asynchronous.utils import AsyncMockPool
 
 sys.path[0:0] = [""]
 
 from test.asynchronous import AsyncIntegrationTest, client_knobs, unittest
-from test.utils_shared import AsyncMockPool, HeartbeatEventListener, async_wait_until
+from test.utils_shared import HeartbeatEventListener, async_wait_until
 
 from pymongo.asynchronous.monitor import Monitor
 from pymongo.errors import ConnectionFailure

test/asynchronous/test_load_balancer.py

@@ -23,6 +23,7 @@
 import threading
 from asyncio import Event
 from test.asynchronous.helpers import ConcurrentRunner, ExceptionCatchingTask
+from test.asynchronous.utils import async_get_pool
 
 import pytest
 
@@ -31,7 +32,6 @@
 from test.asynchronous import AsyncIntegrationTest, async_client_context, unittest
 from test.asynchronous.unified_format import generate_test_classes
 from test.utils_shared import (
-    async_get_pool,
     async_wait_until,
     create_async_event,
 )

test/asynchronous/test_max_staleness.py

@@ -28,7 +28,7 @@
 sys.path[0:0] = [""]
 
 from test.asynchronous import AsyncPyMongoTestCase, async_client_context, unittest
-from test.utils_shared_selection_tests import create_selection_tests
+from test.asynchronous.utils_selection_tests import create_selection_tests
 
 from pymongo.errors import ConfigurationError
 from pymongo.server_selectors import writable_server_selector