Merge branch 'master' of github.com:mongodb/mongo-python-driver into spec-resync-12-22-2025

Author: blink1073

test/asynchronous/test_client.py

@@ -2398,7 +2398,7 @@ def test_gevent_timeout_when_creating_connection(self):
         client = self.async_rs_or_single_client()
         self.addCleanup(client.close)
         coll = client.pymongo_test.test
-        pool = async_get_pool(client)
+        pool = async_get_pool(client)  # type:ignore
 
         # Patch the pool to delay the connect method.
         def delayed_connect(*args, **kwargs):

test/asynchronous/unified_format.py

@@ -329,6 +329,17 @@ async def _create_entity(self, entity_spec, uri=None):
                 kwargs["h"] = uri
             client = await self.test.async_rs_or_single_client(**kwargs)
             await client.aconnect()
+            # Wait for pool to be populated.
+            if "awaitMinPoolSizeMS" in spec:
+                pool = await async_get_pool(client)
+                t0 = time.monotonic()
+                while True:
+                    if (time.monotonic() - t0) > spec["awaitMinPoolSizeMS"] * 1000:
+                        raise ValueError("Test timed out during awaitMinPoolSize")
+                    async with pool.lock:
+                        if len(pool.conns) + pool.active_sockets >= pool.opts.min_pool_size:
+                            break
+                    await asyncio.sleep(0.1)
             self[spec["id"]] = client
             return
         elif entity_type == "database":
@@ -463,7 +474,7 @@ class UnifiedSpecTestMixinV1(AsyncIntegrationTest):
     a class attribute ``TEST_SPEC``.
     """
 
-    SCHEMA_VERSION = Version.from_string("1.25")
+    SCHEMA_VERSION = Version.from_string("1.26")
     RUN_ON_LOAD_BALANCER = True
     TEST_SPEC: Any
     TEST_PATH = ""  # This gets filled in by generate_test_classes
@@ -1551,7 +1562,6 @@ async def test_case(self):
                 if re.search(fail_pattern, description):
                     test_method = unittest.expectedFailure(test_method)
                     break
-
             setattr(cls, test_name, test_method)
 
 

test/asynchronous/utils.py

@@ -28,25 +28,25 @@
 
 from bson.son import SON
 from pymongo import AsyncMongoClient
+from pymongo.asynchronous.pool import Pool, _CancellationContext, _PoolGeneration
 from pymongo.errors import ConfigurationError
 from pymongo.hello import HelloCompat
 from pymongo.lock import _async_create_lock
 from pymongo.operations import _Op
 from pymongo.read_preferences import ReadPreference
 from pymongo.server_selectors import any_server_selector, writable_server_selector
-from pymongo.synchronous.pool import _CancellationContext, _PoolGeneration
 
 _IS_SYNC = False
 
 
-async def async_get_pool(client):
+async def async_get_pool(client: AsyncMongoClient) -> Pool:
     """Get the standalone, primary, or mongos pool."""
     topology = await client._get_topology()
     server = await topology._select_server(writable_server_selector, _Op.TEST)
     return server.pool
 
 
-async def async_get_pools(client):
+async def async_get_pools(client: AsyncMongoClient) -> list[Pool]:
     """Get all pools."""
     return [
         server.pool

test/test_client.py

@@ -2353,7 +2353,7 @@ def test_gevent_timeout_when_creating_connection(self):
         client = self.rs_or_single_client()
         self.addCleanup(client.close)
         coll = client.pymongo_test.test
-        pool = get_pool(client)
+        pool = get_pool(client)  # type:ignore
 
         # Patch the pool to delay the connect method.
         def delayed_connect(*args, **kwargs):

test/unified_format.py

@@ -328,6 +328,17 @@ def _create_entity(self, entity_spec, uri=None):
                 kwargs["h"] = uri
             client = self.test.rs_or_single_client(**kwargs)
             client._connect()
+            # Wait for pool to be populated.
+            if "awaitMinPoolSizeMS" in spec:
+                pool = get_pool(client)
+                t0 = time.monotonic()
+                while True:
+                    if (time.monotonic() - t0) > spec["awaitMinPoolSizeMS"] * 1000:
+                        raise ValueError("Test timed out during awaitMinPoolSize")
+                    with pool.lock:
+                        if len(pool.conns) + pool.active_sockets >= pool.opts.min_pool_size:
+                            break
+                    time.sleep(0.1)
             self[spec["id"]] = client
             return
         elif entity_type == "database":
@@ -462,7 +473,7 @@ class UnifiedSpecTestMixinV1(IntegrationTest):
     a class attribute ``TEST_SPEC``.
     """
 
-    SCHEMA_VERSION = Version.from_string("1.25")
+    SCHEMA_VERSION = Version.from_string("1.26")
     RUN_ON_LOAD_BALANCER = True
     TEST_SPEC: Any
     TEST_PATH = ""  # This gets filled in by generate_test_classes
@@ -1536,7 +1547,6 @@ def test_case(self):
                 if re.search(fail_pattern, description):
                     test_method = unittest.expectedFailure(test_method)
                     break
-
             setattr(cls, test_name, test_method)
 
 

test/utils.py

@@ -34,19 +34,19 @@
 from pymongo.operations import _Op
 from pymongo.read_preferences import ReadPreference
 from pymongo.server_selectors import any_server_selector, writable_server_selector
-from pymongo.synchronous.pool import _CancellationContext, _PoolGeneration
+from pymongo.synchronous.pool import Pool, _CancellationContext, _PoolGeneration
 
 _IS_SYNC = True
 
 
-def get_pool(client):
+def get_pool(client: MongoClient) -> Pool:
     """Get the standalone, primary, or mongos pool."""
     topology = client._get_topology()
     server = topology._select_server(writable_server_selector, _Op.TEST)
     return server.pool
 
 
-def get_pools(client):
+def get_pools(client: MongoClient) -> list[Pool]:
     """Get all pools."""
     return [
         server.pool