Add test case for handling non-PyMongoError

Author: shruti-sridhar

pymongo/asynchronous/mongo_client.py

@@ -2558,7 +2558,9 @@ async def run(self) -> T:
                     if not self._retryable:
                         raise
                     if isinstance(exc, ClientBulkWriteException) and exc.error:
-                        retryable_write_error_exc = exc.error.has_error_label("RetryableWriteError")
+                        retryable_write_error_exc = isinstance(
+                            exc.error, PyMongoError
+                        ) and exc.error.has_error_label("RetryableWriteError")
                     else:
                         retryable_write_error_exc = exc.has_error_label("RetryableWriteError")
                     if retryable_write_error_exc:

pymongo/synchronous/mongo_client.py

@@ -2545,7 +2545,9 @@ def run(self) -> T:
                     if not self._retryable:
                         raise
                     if isinstance(exc, ClientBulkWriteException) and exc.error:
-                        retryable_write_error_exc = exc.error.has_error_label("RetryableWriteError")
+                        retryable_write_error_exc = isinstance(
+                            exc.error, PyMongoError
+                        ) and exc.error.has_error_label("RetryableWriteError")
                     else:
                         retryable_write_error_exc = exc.has_error_label("RetryableWriteError")
                     if retryable_write_error_exc:

test/asynchronous/pymongo_mocks.py

@@ -22,11 +22,14 @@
 from test.asynchronous import async_client_context
 
 from pymongo import AsyncMongoClient, common
+from pymongo.asynchronous.client_bulk import _AsyncClientBulk
 from pymongo.asynchronous.monitor import Monitor
 from pymongo.asynchronous.pool import Pool
-from pymongo.errors import AutoReconnect, NetworkTimeout
+from pymongo.errors import AutoReconnect, ClientBulkWriteException, NetworkTimeout
 from pymongo.hello import Hello, HelloCompat
+from pymongo.operations import _Op
 from pymongo.server_description import ServerDescription
+from pymongo.write_concern import WriteConcern
 
 _IS_SYNC = False
 
@@ -246,7 +249,18 @@ def mock_hello(self, host):
 
         return response, rtt
 
+    async def mock_client_bulk_write(self, models):
+        blk = _AsyncMockClientBulk(self, write_concern=WriteConcern(w=1))
+        for model in models:
+            model._add_to_client_bulk(blk)
+        return await blk.execute(None, _Op.BULK_WRITE)
+
     def _process_periodic_tasks(self):
         # Avoid the background thread causing races, e.g. a surprising
         # reconnect while we're trying to test a disconnected client.
         pass
+
+
+class _AsyncMockClientBulk(_AsyncClientBulk):
+    async def write_command(self, bwc, cmd, request_id, msg, to_send_ops, to_send_ns, client):
+        return {"error": TypeError("mock type error")}

test/asynchronous/test_client_bulk_write.py

@@ -19,7 +19,13 @@
 
 sys.path[0:0] = [""]
 
-from test.asynchronous import AsyncIntegrationTest, async_client_context, unittest
+from test.asynchronous import (
+    AsyncIntegrationTest,
+    AsyncMockClientTest,
+    async_client_context,
+    unittest,
+)
+from test.asynchronous.pymongo_mocks import AsyncMockClient
 from test.utils import (
     OvertCommandListener,
     async_rs_or_single_client,
@@ -577,3 +583,22 @@ async def test_timeout_in_multi_batch_bulk_write(self):
             if event.command_name == "bulkWrite":
                 bulk_write_events.append(event)
         self.assertEqual(len(bulk_write_events), 2)
+
+
+class TestClientBulkWriteMock(AsyncMockClientTest):
+    @async_client_context.require_version_min(8, 0, 0, -24)
+    async def test_handles_non_pymongo_error(self):
+        mock_client = await AsyncMockClient.get_async_mock_client(
+            standalones=[],
+            members=["a:1", "b:2", "c:3"],
+            mongoses=[],
+            host="b:2",  # Pass a secondary.
+            replicaSet="rs",
+            heartbeatFrequencyMS=500,
+        )
+        self.addAsyncCleanup(mock_client.aclose)
+        models = [InsertOne(namespace="db.coll", document={"a": "b"})]
+        with self.assertRaises(ClientBulkWriteException) as context:
+            await mock_client.mock_client_bulk_write(models=models)
+        self.assertIsInstance(context.exception.error, TypeError)
+        self.assertFalse(hasattr(context.exception.error, "details"))

test/pymongo_mocks.py

@@ -21,11 +21,14 @@
 from test import client_context
 
 from pymongo import MongoClient, common
-from pymongo.errors import AutoReconnect, NetworkTimeout
+from pymongo.errors import AutoReconnect, ClientBulkWriteException, NetworkTimeout
 from pymongo.hello import Hello, HelloCompat
+from pymongo.operations import _Op
 from pymongo.server_description import ServerDescription
+from pymongo.synchronous.client_bulk import _ClientBulk
 from pymongo.synchronous.monitor import Monitor
 from pymongo.synchronous.pool import Pool
+from pymongo.write_concern import WriteConcern
 
 _IS_SYNC = True
 
@@ -245,7 +248,18 @@ def mock_hello(self, host):
 
         return response, rtt
 
+    def mock_client_bulk_write(self, models):
+        blk = _MockClientBulk(self, write_concern=WriteConcern(w=1))
+        for model in models:
+            model._add_to_client_bulk(blk)
+        return blk.execute(None, _Op.BULK_WRITE)
+
     def _process_periodic_tasks(self):
         # Avoid the background thread causing races, e.g. a surprising
         # reconnect while we're trying to test a disconnected client.
         pass
+
+
+class _MockClientBulk(_ClientBulk):
+    def write_command(self, bwc, cmd, request_id, msg, to_send_ops, to_send_ns, client):
+        return {"error": TypeError("mock type error")}

test/test_client_bulk_write.py

@@ -19,7 +19,13 @@
 
 sys.path[0:0] = [""]
 
-from test import IntegrationTest, client_context, unittest
+from test import (
+    IntegrationTest,
+    MockClientTest,
+    client_context,
+    unittest,
+)
+from test.pymongo_mocks import MockClient
 from test.utils import (
     OvertCommandListener,
     rs_or_single_client,
@@ -577,3 +583,22 @@ def test_timeout_in_multi_batch_bulk_write(self):
             if event.command_name == "bulkWrite":
                 bulk_write_events.append(event)
         self.assertEqual(len(bulk_write_events), 2)
+
+
+class TestClientBulkWriteMock(MockClientTest):
+    @client_context.require_version_min(8, 0, 0, -24)
+    def test_handles_non_pymongo_error(self):
+        mock_client = MockClient.get_mock_client(
+            standalones=[],
+            members=["a:1", "b:2", "c:3"],
+            mongoses=[],
+            host="b:2",  # Pass a secondary.
+            replicaSet="rs",
+            heartbeatFrequencyMS=500,
+        )
+        self.addCleanup(mock_client.close)
+        models = [InsertOne(namespace="db.coll", document={"a": "b"})]
+        with self.assertRaises(ClientBulkWriteException) as context:
+            mock_client.mock_client_bulk_write(models=models)
+        self.assertIsInstance(context.exception.error, TypeError)
+        self.assertFalse(hasattr(context.exception.error, "details"))