Merge branch 'master' of github.com:mongodb/mongo-python-driver

Author: blink1073

test/asynchronous/test_async_cancellation.py

@@ -17,7 +17,8 @@
 
 import asyncio
 import sys
-from test.utils 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_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.asynchronous.utils import (
+    async_get_pool,
+    async_wait_until,
+    asyncAssertRaisesExactly,
+)
 from test.test_binary import BinaryData
-from test.utils import (
+from test.utils_shared import (
     NTHREADS,
     CMAPListener,
     FunctionCallRecorder,
-    async_get_pool,
-    async_wait_until,
-    asyncAssertRaisesExactly,
     delay,
     gevent_monkey_patched,
     is_greenthread_patched,

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

@@ -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
@@ -33,12 +34,10 @@
     AsyncUnitTest,
     async_client_context,
 )
-from test.utils import (
+from test.utils_shared import (
     IMPOSSIBLE_WRITE_CONCERN,
     EventListener,
     OvertCommandListener,
-    async_get_pool,
-    async_is_mongos,
     async_wait_until,
 )
 

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