PYTHON-5113 - Refactor test utils for async

Author: NoahStapp

test/asynchronous/test_async_cancellation.py

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

test/asynchronous/test_auth.py

@@ -30,7 +30,7 @@
     async_client_context,
     unittest,
 )
-from test.utils import AllowListEventListener, delay, ignore_deprecations
+from test.utils_shared import AllowListEventListener, delay, ignore_deprecations
 
 import pytest
 

test/asynchronous/test_bulk.py

@@ -24,7 +24,7 @@
 sys.path[0:0] = [""]
 
 from test.asynchronous import AsyncIntegrationTest, async_client_context, remove_all_users, unittest
-from test.utils import async_wait_until
+from test.utils_shared import async_wait_until
 
 from bson.binary import Binary, UuidRepresentation
 from bson.codec_options import CodecOptions

test/asynchronous/test_change_stream.py

@@ -36,7 +36,7 @@
     unittest,
 )
 from test.asynchronous.unified_format import generate_test_classes
-from test.utils import (
+from test.utils_shared import (
     AllowListEventListener,
     EventListener,
     OvertCommandListener,

test/asynchronous/test_client.py

@@ -60,14 +60,16 @@
     unittest,
 )
 from test.asynchronous.pymongo_mocks import AsyncMockClient
-from test.test_binary import BinaryData
-from test.utils import (
-    NTHREADS,
-    CMAPListener,
-    FunctionCallRecorder,
+from test.asynchronous.utils import (
+    AsyncFunctionCallRecorder,
     async_get_pool,
     async_wait_until,
     asyncAssertRaisesExactly,
+)
+from test.test_binary import BinaryData
+from test.utils_shared import (
+    NTHREADS,
+    CMAPListener,
     delay,
     gevent_monkey_patched,
     is_greenthread_patched,
@@ -511,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 = FunctionCallRecorder(_resolve)
+        patched_resolver = AsyncFunctionCallRecorder(_resolve)
         pymongo.srv_resolver._resolve = patched_resolver
 
         def reset_resolver():

test/asynchronous/test_client_bulk_write.py

@@ -25,7 +25,7 @@
     async_client_context,
     unittest,
 )
-from test.utils import (
+from test.utils_shared import (
     OvertCommandListener,
 )
 from unittest.mock import patch

test/asynchronous/test_collation.py

@@ -18,7 +18,7 @@
 import functools
 import warnings
 from test.asynchronous import AsyncIntegrationTest, async_client_context, unittest
-from test.utils import EventListener, OvertCommandListener
+from test.utils_shared import EventListener, OvertCommandListener
 from typing import Any
 
 from pymongo.asynchronous.helpers import anext

test/asynchronous/test_collection.py

@@ -33,7 +33,7 @@
     AsyncUnitTest,
     async_client_context,
 )
-from test.utils import (
+from test.utils_shared import (
     IMPOSSIBLE_WRITE_CONCERN,
     EventListener,
     OvertCommandListener,

test/asynchronous/test_comment.py

@@ -22,7 +22,7 @@
 sys.path[0:0] = [""]
 from asyncio import iscoroutinefunction
 from test.asynchronous import AsyncIntegrationTest, async_client_context, unittest
-from test.utils import OvertCommandListener
+from test.utils_shared import OvertCommandListener
 
 from bson.dbref import DBRef
 from pymongo.asynchronous.command_cursor import AsyncCommandCursor

test/asynchronous/test_concurrency.py

@@ -18,7 +18,7 @@
 import asyncio
 import time
 from test.asynchronous import AsyncIntegrationTest, async_client_context
-from test.utils import delay
+from test.utils_shared import delay
 
 _IS_SYNC = False
 

test/asynchronous/test_connection_monitoring.py

@@ -26,7 +26,7 @@
 from test.asynchronous import AsyncIntegrationTest, client_knobs, unittest
 from test.asynchronous.pymongo_mocks import DummyMonitor
 from test.asynchronous.utils_spec_runner import AsyncSpecTestCreator, SpecRunnerTask
-from test.utils import (
+from test.utils_shared import (
     CMAPListener,
     async_client_context,
     async_get_pool,

test/asynchronous/test_connections_survive_primary_stepdown_spec.py

@@ -25,7 +25,7 @@
     unittest,
 )
 from test.asynchronous.helpers import async_repl_set_step_down
-from test.utils import (
+from test.utils_shared import (
     CMAPListener,
     async_ensure_all_connected,
 )

test/asynchronous/test_cursor.py

@@ -31,7 +31,7 @@
 sys.path[0:0] = [""]
 
 from test.asynchronous import AsyncIntegrationTest, async_client_context, unittest
-from test.utils import (
+from test.utils_shared import (
     AllowListEventListener,
     EventListener,
     OvertCommandListener,

test/asynchronous/test_data_lake.py

@@ -25,7 +25,7 @@
 
 from test.asynchronous import AsyncIntegrationTest, AsyncUnitTest, async_client_context, unittest
 from test.asynchronous.unified_format import generate_test_classes
-from test.utils import (
+from test.utils_shared import (
     OvertCommandListener,
 )
 

test/asynchronous/test_database.py

@@ -26,7 +26,7 @@
 from test import unittest
 from test.asynchronous import AsyncIntegrationTest, async_client_context
 from test.test_custom_types import DECIMAL_CODECOPTS
-from test.utils import (
+from test.utils_shared import (
     IMPOSSIBLE_WRITE_CONCERN,
     OvertCommandListener,
     async_wait_until,

test/asynchronous/test_dns.py

@@ -29,7 +29,7 @@
     async_client_context,
     unittest,
 )
-from test.utils import async_wait_until
+from test.utils_shared import async_wait_until
 
 from pymongo.common import validate_read_preference_tags
 from pymongo.errors import ConfigurationError

test/asynchronous/test_encryption.py

@@ -64,7 +64,7 @@
     KMIP_CREDS,
     LOCAL_MASTER_KEY,
 )
-from test.utils import (
+from test.utils_shared import (
     AllowListEventListener,
     OvertCommandListener,
     TopologyEventListener,

test/asynchronous/test_examples.py

@@ -26,7 +26,7 @@
 sys.path[0:0] = [""]
 
 from test.asynchronous import AsyncIntegrationTest, async_client_context, unittest
-from test.utils import async_wait_until
+from test.utils_shared import async_wait_until
 
 import pymongo
 from pymongo.asynchronous.helpers import anext

test/asynchronous/test_grid_file.py

@@ -33,7 +33,7 @@
 
 sys.path[0:0] = [""]
 
-from test.utils import OvertCommandListener
+from test.utils_shared import OvertCommandListener
 
 from bson.objectid import ObjectId
 from gridfs.asynchronous.grid_file import (

test/asynchronous/test_gridfs.py

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

test/asynchronous/test_gridfs_bucket.py

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

test/asynchronous/test_heartbeat_monitoring.py

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

test/asynchronous/test_index_management.py

@@ -29,7 +29,7 @@
 
 from test.asynchronous import AsyncIntegrationTest, AsyncPyMongoTestCase, unittest
 from test.asynchronous.unified_format import generate_test_classes
-from test.utils import AllowListEventListener, OvertCommandListener
+from test.utils_shared import AllowListEventListener, OvertCommandListener
 
 from pymongo.errors import OperationFailure
 from pymongo.operations import SearchIndexModel

test/asynchronous/test_load_balancer.py

@@ -30,7 +30,7 @@
 
 from test.asynchronous import AsyncIntegrationTest, async_client_context, unittest
 from test.asynchronous.unified_format import generate_test_classes
-from test.utils import (
+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_selection_tests import create_selection_tests
+from test.utils_shared_selection_tests import create_selection_tests
 
 from pymongo.errors import ConfigurationError
 from pymongo.server_selectors import writable_server_selector

test/asynchronous/test_mongos_load_balancing.py

@@ -26,7 +26,7 @@
 
 from test.asynchronous import AsyncMockClientTest, async_client_context, connected, unittest
 from test.asynchronous.pymongo_mocks import AsyncMockClient
-from test.utils import async_wait_until
+from test.utils_shared import async_wait_until
 
 from pymongo.errors import AutoReconnect, InvalidOperation
 from pymongo.server_selectors import writable_server_selector

test/asynchronous/test_monitoring.py

@@ -29,7 +29,7 @@
     sanitize_cmd,
     unittest,
 )
-from test.utils import (
+from test.utils_shared import (
     EventListener,
     OvertCommandListener,
     async_wait_until,

test/asynchronous/test_pooling.py

@@ -33,7 +33,7 @@
 
 from test.asynchronous import AsyncIntegrationTest, async_client_context, unittest
 from test.asynchronous.helpers import ConcurrentRunner
-from test.utils import async_get_pool, async_joinall, delay
+from test.utils_shared import async_get_pool, async_joinall, delay
 
 from pymongo.asynchronous.pool import Pool, PoolOptions
 from pymongo.socket_checker import SocketChecker

test/asynchronous/test_read_concern.py

@@ -21,7 +21,7 @@
 sys.path[0:0] = [""]
 
 from test.asynchronous import AsyncIntegrationTest, async_client_context
-from test.utils import OvertCommandListener
+from test.utils_shared import OvertCommandListener
 
 from bson.son import SON
 from pymongo.errors import OperationFailure

test/asynchronous/test_read_preferences.py

@@ -33,7 +33,7 @@
     connected,
     unittest,
 )
-from test.utils import (
+from test.utils_shared import (
     OvertCommandListener,
     async_wait_until,
     one,

test/asynchronous/test_read_write_concern_spec.py

@@ -25,7 +25,7 @@
 
 from test.asynchronous import AsyncIntegrationTest, async_client_context, unittest
 from test.asynchronous.unified_format import generate_test_classes
-from test.utils import OvertCommandListener
+from test.utils_shared import OvertCommandListener
 
 from pymongo import DESCENDING
 from pymongo.asynchronous.mongo_client import AsyncMongoClient

test/asynchronous/test_retryable_reads.py

@@ -31,7 +31,7 @@
     client_knobs,
     unittest,
 )
-from test.utils import (
+from test.utils_shared import (
     CMAPListener,
     OvertCommandListener,
     async_set_fail_point,

test/asynchronous/test_retryable_writes.py

@@ -30,7 +30,7 @@
     unittest,
 )
 from test.asynchronous.helpers import client_knobs
-from test.utils import (
+from test.utils_shared import (
     CMAPListener,
     DeprecationFilter,
     EventListener,

test/asynchronous/test_sdam_monitoring_spec.py

@@ -25,7 +25,7 @@
 sys.path[0:0] = [""]
 
 from test.asynchronous import AsyncIntegrationTest, async_client_context, client_knobs, unittest
-from test.utils import (
+from test.utils_shared import (
     ServerAndTopologyEventListener,
     async_wait_until,
     server_name_to_type,

test/asynchronous/test_server_selection.py

@@ -31,17 +31,17 @@
 sys.path[0:0] = [""]
 
 from test.asynchronous import AsyncIntegrationTest, async_client_context, unittest
+from test.asynchronous.utils import AsyncFunctionCallRecorder, async_wait_until
 from test.asynchronous.utils_selection_tests import (
     create_selection_tests,
-    get_addresses,
     get_topology_settings_dict,
+)
+from test.utils_selection_tests_shared import (
+    get_addresses,
     make_server_description,
 )
-from test.utils import (
-    EventListener,
-    FunctionCallRecorder,
+from test.utils_shared import (
     OvertCommandListener,
-    async_wait_until,
 )
 
 _IS_SYNC = False
@@ -122,7 +122,7 @@ async def test_invalid_server_selector(self):
 
     @async_client_context.require_replica_set
     async def test_selector_called(self):
-        selector = FunctionCallRecorder(lambda x: x)
+        selector = AsyncFunctionCallRecorder(lambda x: x)
 
         # Client setup.
         mongo_client = await self.async_rs_or_single_client(server_selector=selector)
@@ -175,7 +175,7 @@ async def test_latency_threshold_application(self):
 
     @async_client_context.require_replica_set
     async def test_server_selector_bypassed(self):
-        selector = FunctionCallRecorder(lambda x: x)
+        selector = AsyncFunctionCallRecorder(lambda x: x)
 
         scenario_def = {
             "topology_description": {

test/asynchronous/test_server_selection_in_window.py

@@ -23,7 +23,7 @@
 from test.asynchronous.helpers import ConcurrentRunner
 from test.asynchronous.utils_selection_tests import create_topology
 from test.asynchronous.utils_spec_runner import AsyncSpecTestCreator
-from test.utils import (
+from test.utils_shared import (
     CMAPListener,
     OvertCommandListener,
     async_get_pool,

test/asynchronous/test_session.py

@@ -36,7 +36,7 @@
     async_client_context,
     unittest,
 )
-from test.utils import (
+from test.utils_shared import (
     EventListener,
     OvertCommandListener,
     async_wait_until,