Add test, revert pymongo changes

Author: NoahStapp

pymongo/asynchronous/pool.py

@@ -190,10 +190,6 @@ def _raise_connection_failure(
 ) -> NoReturn:
     """Convert a socket.error to ConnectionFailure and raise it."""
     host, port = address
-    if isinstance(error, PyMongoError) and error._error_labels:
-        labels = error._error_labels
-    else:
-        labels = None
     # If connecting to a Unix socket, port will be None.
     if port is not None:
         msg = "%s:%d: %s" % (host, port, error)
@@ -204,15 +200,15 @@ def _raise_connection_failure(
     if "configured timeouts" not in msg:
         msg += format_timeout_details(timeout_details)
     if isinstance(error, socket.timeout):
-        raise NetworkTimeout(msg, errors={"errorLabels": labels}) from error
+        raise NetworkTimeout(msg) from error
     elif isinstance(error, SSLError) and "timed out" in str(error):
         # Eventlet does not distinguish TLS network timeouts from other
         # SSLErrors (https://github.com/eventlet/eventlet/issues/692).
         # Luckily, we can work around this limitation because the phrase
         # 'timed out' appears in all the timeout related SSLErrors raised.
-        raise NetworkTimeout(msg, errors={"errorLabels": labels}) from error
+        raise NetworkTimeout(msg) from error
     else:
-        raise AutoReconnect(msg, errors={"errorLabels": labels}) from error
+        raise AutoReconnect(msg) from error
 
 
 def _get_timeout_details(options: PoolOptions) -> dict[str, float]:
@@ -1424,9 +1420,9 @@ def _raise_if_not_ready(self, checkout_started_time: float, emit_event: bool) ->
                     )
 
             details = _get_timeout_details(self.opts)
-            error = AutoReconnect("connection pool paused")
-            error._add_error_label("TransientTransactionError")
-            _raise_connection_failure(self.address, error, timeout_details=details)
+            _raise_connection_failure(
+                self.address, AutoReconnect("connection pool paused"), timeout_details=details
+            )
 
     async def _get_conn(
         self, checkout_started_time: float, handler: Optional[_MongoClientErrorHandler] = None

pymongo/synchronous/pool.py

@@ -190,10 +190,6 @@ def _raise_connection_failure(
 ) -> NoReturn:
     """Convert a socket.error to ConnectionFailure and raise it."""
     host, port = address
-    if isinstance(error, PyMongoError) and error._error_labels:
-        labels = error._error_labels
-    else:
-        labels = None
     # If connecting to a Unix socket, port will be None.
     if port is not None:
         msg = "%s:%d: %s" % (host, port, error)
@@ -204,15 +200,15 @@ def _raise_connection_failure(
     if "configured timeouts" not in msg:
         msg += format_timeout_details(timeout_details)
     if isinstance(error, socket.timeout):
-        raise NetworkTimeout(msg, errors={"errorLabels": labels}) from error
+        raise NetworkTimeout(msg) from error
     elif isinstance(error, SSLError) and "timed out" in str(error):
         # Eventlet does not distinguish TLS network timeouts from other
         # SSLErrors (https://github.com/eventlet/eventlet/issues/692).
         # Luckily, we can work around this limitation because the phrase
         # 'timed out' appears in all the timeout related SSLErrors raised.
-        raise NetworkTimeout(msg, errors={"errorLabels": labels}) from error
+        raise NetworkTimeout(msg) from error
     else:
-        raise AutoReconnect(msg, errors={"errorLabels": labels}) from error
+        raise AutoReconnect(msg) from error
 
 
 def _get_timeout_details(options: PoolOptions) -> dict[str, float]:
@@ -1418,9 +1414,9 @@ def _raise_if_not_ready(self, checkout_started_time: float, emit_event: bool) ->
                     )
 
             details = _get_timeout_details(self.opts)
-            error = AutoReconnect("connection pool paused")
-            error._add_error_label("TransientTransactionError")
-            _raise_connection_failure(self.address, error, timeout_details=details)
+            _raise_connection_failure(
+                self.address, AutoReconnect("connection pool paused"), timeout_details=details
+            )
 
     def _get_conn(
         self, checkout_started_time: float, handler: Optional[_MongoClientErrorHandler] = None

test/asynchronous/test_pooling.py

@@ -608,21 +608,6 @@ async def test_max_pool_size_with_connection_failure(self):
             # seems error-prone, so check the message too.
             self.assertNotIn("waiting for socket from pool", str(context.exception))
 
-    async def test_pool_cleared_error_labelled_transient(self):
-        test_pool = Pool(
-            ("localhost", 27017),
-            PoolOptions(max_pool_size=1),
-        )
-        # Pause the pool, causing it to fail connection checkout.
-        test_pool.state = PoolState.PAUSED
-
-        with self.assertRaises(AutoReconnect) as context:
-            async with test_pool.checkout():
-                pass
-
-        # Verify that the TransientTransactionError label is present in the error.
-        self.assertTrue(context.exception.has_error_label("TransientTransactionError"))
-
 
 if __name__ == "__main__":
     unittest.main()

test/asynchronous/test_transactions.py

@@ -20,6 +20,8 @@
 from test.asynchronous.utils_spec_runner import AsyncSpecRunner
 
 from gridfs.asynchronous.grid_file import AsyncGridFS, AsyncGridFSBucket
+from pymongo.asynchronous.pool import PoolState
+from pymongo.server_selectors import writable_server_selector
 
 sys.path[0:0] = [""]
 
@@ -39,6 +41,7 @@
 from pymongo.asynchronous.cursor import AsyncCursor
 from pymongo.asynchronous.helpers import anext
 from pymongo.errors import (
+    AutoReconnect,
     CollectionInvalid,
     ConfigurationError,
     ConnectionFailure,
@@ -386,6 +389,22 @@ async def find_raw_batches(*args, **kwargs):
                 if isinstance(res, (AsyncCommandCursor, AsyncCursor)):
                     await res.to_list()
 
+    @async_client_context.require_transactions
+    async def test_transaction_pool_cleared_error_labelled_transient(self):
+        c = await self.async_single_client()
+
+        with self.assertRaises(AutoReconnect) as context:
+            async with c.start_session() as session:
+                async with await session.start_transaction():
+                    server = await c._select_server(writable_server_selector, session, "test")
+                    # Pause the server's pool, causing it to fail connection checkout.
+                    server.pool.state = PoolState.PAUSED
+                    async with c._checkout(server, session):
+                        pass
+
+        # Verify that the TransientTransactionError label is present in the error.
+        self.assertTrue(context.exception.has_error_label("TransientTransactionError"))
+
 
 class PatchSessionTimeout:
     """Patches the client_session's with_transaction timeout for testing."""

test/test_pooling.py

@@ -606,21 +606,6 @@ def test_max_pool_size_with_connection_failure(self):
             # seems error-prone, so check the message too.
             self.assertNotIn("waiting for socket from pool", str(context.exception))
 
-    def test_pool_cleared_error_labelled_transient(self):
-        test_pool = Pool(
-            ("localhost", 27017),
-            PoolOptions(max_pool_size=1),
-        )
-        # Pause the pool, causing it to fail connection checkout.
-        test_pool.state = PoolState.PAUSED
-
-        with self.assertRaises(AutoReconnect) as context:
-            with test_pool.checkout():
-                pass
-
-        # Verify that the TransientTransactionError label is present in the error.
-        self.assertTrue(context.exception.has_error_label("TransientTransactionError"))
-
 
 if __name__ == "__main__":
     unittest.main()

test/test_transactions.py

@@ -20,6 +20,8 @@
 from test.utils_spec_runner import SpecRunner
 
 from gridfs.synchronous.grid_file import GridFS, GridFSBucket
+from pymongo.server_selectors import writable_server_selector
+from pymongo.synchronous.pool import PoolState
 
 sys.path[0:0] = [""]
 
@@ -34,6 +36,7 @@
 from bson.raw_bson import RawBSONDocument
 from pymongo import WriteConcern
 from pymongo.errors import (
+    AutoReconnect,
     CollectionInvalid,
     ConfigurationError,
     ConnectionFailure,
@@ -378,6 +381,22 @@ def find_raw_batches(*args, **kwargs):
                 if isinstance(res, (CommandCursor, Cursor)):
                     res.to_list()
 
+    @client_context.require_transactions
+    def test_transaction_pool_cleared_error_labelled_transient(self):
+        c = self.single_client()
+
+        with self.assertRaises(AutoReconnect) as context:
+            with c.start_session() as session:
+                with session.start_transaction():
+                    server = c._select_server(writable_server_selector, session, "test")
+                    # Pause the server's pool, causing it to fail connection checkout.
+                    server.pool.state = PoolState.PAUSED
+                    with c._checkout(server, session):
+                        pass
+
+        # Verify that the TransientTransactionError label is present in the error.
+        self.assertTrue(context.exception.has_error_label("TransientTransactionError"))
+
 
 class PatchSessionTimeout:
     """Patches the client_session's with_transaction timeout for testing."""