fix and update tests

Author: blink1073

.evergreen/run-tests.sh

@@ -30,6 +30,6 @@ uv sync ${UV_ARGS} --reinstall --quiet
 uv pip list
 
 # Start the test runner.
-uv run ${UV_ARGS} .evergreen/scripts/run_tests.py -vv test/asynchronous/test_pooling.py
+uv run ${UV_ARGS} .evergreen/scripts/run_tests.py "$@"
 
 popd

pymongo/asynchronous/pool.py

@@ -53,10 +53,12 @@
     DocumentTooLarge,
     ExecutionTimeout,
     InvalidOperation,
+    NetworkTimeout,
     NotPrimaryError,
     OperationFailure,
     PyMongoError,
     WaitQueueTimeoutError,
+    _OperationCancelled,
 )
 from pymongo.hello import Hello, HelloCompat
 from pymongo.helpers_shared import _get_timeout_details, format_timeout_details
@@ -1107,7 +1109,9 @@ async def connect(self, handler: Optional[_MongoClientErrorHandler] = None) -> A
             async with self.lock:
                 self.active_contexts.discard(conn.cancel_context)
             # Enter backoff mode and reconnect on establishment failure.
-            if isinstance(e, ConnectionFailure):
+            if isinstance(e, ConnectionFailure) and not isinstance(
+                e, (_OperationCancelled, NetworkTimeout)
+            ):
                 self._backoff += 1
                 # TODO: emit a message about backoff.
                 return await self.connect(handler)

pymongo/synchronous/pool.py

@@ -50,10 +50,12 @@
     DocumentTooLarge,
     ExecutionTimeout,
     InvalidOperation,
+    NetworkTimeout,
     NotPrimaryError,
     OperationFailure,
     PyMongoError,
     WaitQueueTimeoutError,
+    _OperationCancelled,
 )
 from pymongo.hello import Hello, HelloCompat
 from pymongo.helpers_shared import _get_timeout_details, format_timeout_details
@@ -1103,7 +1105,9 @@ def connect(self, handler: Optional[_MongoClientErrorHandler] = None) -> Connect
             with self.lock:
                 self.active_contexts.discard(conn.cancel_context)
             # Enter backoff mode and reconnect on establishment failure.
-            if isinstance(e, ConnectionFailure):
+            if isinstance(e, ConnectionFailure) and not isinstance(
+                e, (_OperationCancelled, NetworkTimeout)
+            ):
                 self._backoff += 1
                 # TODO: emit a message about backoff.
                 return self.connect(handler)

test/asynchronous/test_pooling.py

@@ -508,10 +508,10 @@ async def test_connection_timeout_message(self):
             with self.assertRaises(Exception) as error:
                 await client.admin.command("ping")
 
-        if "(configured timeouts: socketTimeoutMS: 500.0ms, connectTimeoutMS: 500.0ms)" not in str(
-            error.exception
-        ):
-            raise error.exception
+        self.assertIn(
+            "(configured timeouts: socketTimeoutMS: 500.0ms, connectTimeoutMS: 500.0ms)",
+            str(error.exception),
+        )
 
     @async_client_context.require_failCommand_appName
     async def test_pool_backoff_preserves_existing_collections(self):

test/connection_monitoring/pool-create-min-size-error.json

@@ -9,21 +9,23 @@
   ],
   "failPoint": {
     "configureFailPoint": "failCommand",
-    "mode": {
-      "times": 50
-    },
+    "mode": "alwaysOn",
     "data": {
       "failCommands": [
         "isMaster",
         "hello"
       ],
-      "closeConnection": true,
+      "closeConnection": false,
+      "blockConnection": true,
+      "blockTimeMS": 1000,
       "appName": "poolCreateMinSizeErrorTest"
     }
   },
   "poolOptions": {
     "minPoolSize": 1,
     "backgroundThreadIntervalMS": 50,
+    "socketTimeoutMS": 500,
+    "connectTimeoutMS": 500,
     "appName": "poolCreateMinSizeErrorTest"
   },
   "operations": [

test/test_pooling.py

@@ -506,10 +506,10 @@ def test_connection_timeout_message(self):
             with self.assertRaises(Exception) as error:
                 client.admin.command("ping")
 
-        if "(configured timeouts: socketTimeoutMS: 500.0ms, connectTimeoutMS: 500.0ms)" not in str(
-            error.exception
-        ):
-            raise error.exception
+        self.assertIn(
+            "(configured timeouts: socketTimeoutMS: 500.0ms, connectTimeoutMS: 500.0ms)",
+            str(error.exception),
+        )
 
     @client_context.require_failCommand_appName
     def test_pool_backoff_preserves_existing_collections(self):