test updates

Author: blink1073

pymongo/network_layer.py

@@ -256,7 +256,6 @@ def __init__(self, timeout: Optional[float] = None):
         self._timeout = timeout
         self._closed = asyncio.get_running_loop().create_future()
         self._connection_lost = False
-        self._closing_exception = None
 
     def settimeout(self, timeout: float | None) -> None:
         self._timeout = timeout
@@ -270,11 +269,9 @@ def close(self, exc: Optional[Exception] = None) -> None:
         self.transport.abort()
         self._resolve_pending(exc)
         self._connection_lost = True
-        self._closing_exception = exc  # type:ignore[assignment]
 
     def connection_lost(self, exc: Optional[Exception] = None) -> None:
         self._resolve_pending(exc)
-        self._closing_exception = exc  # type:ignore[assignment]
         if not self._closed.done():
             self._closed.set_result(None)
 
@@ -338,11 +335,8 @@ async def read(self, request_id: Optional[int], max_message_size: int) -> tuple[
         if self._done_messages:
             message = await self._done_messages.popleft()
         else:
-            if self._closed.done():
-                if self._closing_exception:
-                    raise self._closing_exception
-                else:
-                    raise OSError("connection closed")
+            if self.transport and self.transport.is_closing():
+                raise OSError("connection is already closed")
             read_waiter = asyncio.get_running_loop().create_future()
             self._pending_messages.append(read_waiter)
             try:
@@ -480,7 +474,6 @@ def _resolve_pending(self, exc: Optional[Exception] = None) -> None:
                 else:
                     msg.set_exception(exc)
             self._done_messages.append(msg)
-        self._pending_messages.clear()
 
 
 class PyMongoKMSProtocol(PyMongoBaseProtocol):

test/connection_logging/connection-logging.json

@@ -446,22 +446,6 @@
                 }
               }
             },
-            {
-              "level": "debug",
-              "component": "connection",
-              "data": {
-                "message": "Connection pool cleared",
-                "serverHost": {
-                  "$$type": "string"
-                },
-                "serverPort": {
-                  "$$type": [
-                    "int",
-                    "long"
-                  ]
-                }
-              }
-            },
             {
               "level": "debug",
               "component": "connection",
@@ -514,6 +498,22 @@
                   ]
                 }
               }
+            },
+            {
+              "level": "debug",
+              "component": "connection",
+              "data": {
+                "message": "Connection pool cleared",
+                "serverHost": {
+                  "$$type": "string"
+                },
+                "serverPort": {
+                  "$$type": [
+                    "int",
+                    "long"
+                  ]
+                }
+              }
             }
           ]
         }

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

@@ -15,13 +15,16 @@
         "isMaster",
         "hello"
       ],
-      "closeConnection": true,
+      "blockConnection": true,
+      "blockTimeMS": 1000,
       "appName": "poolCreateMinSizeErrorTest"
     }
   },
   "poolOptions": {
     "minPoolSize": 1,
     "backgroundThreadIntervalMS": 50,
+    "socketTimeoutMS": 500,
+    "connectTimeoutMS": 500,
     "appName": "poolCreateMinSizeErrorTest"
   },
   "operations": [
@@ -47,15 +50,15 @@
       "type": "ConnectionCreated",
       "address": 42
     },
-    {
-      "type": "ConnectionPoolCleared",
-      "address": 42
-    },
     {
       "type": "ConnectionClosed",
       "address": 42,
       "connectionId": 42,
       "reason": "error"
+    },
+    {
+      "type": "ConnectionPoolCleared",
+      "address": 42
     }
   ],
   "ignore": [

test/load_balancer/sdam-error-handling.json

@@ -274,7 +274,9 @@
             "client": "failPointClient",
             "failPoint": {
               "configureFailPoint": "failCommand",
-              "mode": "alwaysOn",
+              "mode": {
+                "times": 1
+              },
               "data": {
                 "failCommands": [
                   "isMaster",
@@ -294,9 +296,7 @@
               "x": 1
             }
           },
-          "expectError": {
-            "isClientError": true
-          }
+          "ignoreResultAndError": true
         }
       ],
       "expectEvents": [
@@ -370,9 +370,6 @@
             {
               "connectionCreatedEvent": {}
             },
-            {
-              "poolClearedEvent": {}
-            },
             {
               "connectionClosedEvent": {
                 "reason": "error"
@@ -382,6 +379,9 @@
               "connectionCheckOutFailedEvent": {
                 "reason": "connectionError"
               }
+            },
+            {
+              "poolClearedEvent": {}
             }
           ]
         }