IH review

Author: NoahStapp

test/asynchronous/test_client_backpressure.py

@@ -49,6 +49,12 @@
 }
 
 
+def get_mock_overload_error(times: int):
+    error = mock_overload_error.copy()
+    error["mode"] = {"times": times}
+    return error
+
+
 class TestBackpressure(AsyncIntegrationTest):
     RUN_ON_LOAD_BALANCER = True
 
@@ -57,14 +63,12 @@ async def test_retry_overload_error_command(self):
         await self.db.t.insert_one({"x": 1})
 
         # Ensure command is retried on overload error.
-        fail_many = mock_overload_error.copy()
-        fail_many["mode"] = {"times": MAX_ADAPTIVE_RETRIES}
+        fail_many = get_mock_overload_error(MAX_ADAPTIVE_RETRIES)
         async with self.fail_point(fail_many):
             await self.db.command("find", "t")
 
         # Ensure command stops retrying after MAX_ADAPTIVE_RETRIES.
-        fail_too_many = mock_overload_error.copy()
-        fail_too_many["mode"] = {"times": MAX_ADAPTIVE_RETRIES + 1}
+        fail_too_many = get_mock_overload_error(MAX_ADAPTIVE_RETRIES + 1)
         async with self.fail_point(fail_too_many):
             with self.assertRaises(PyMongoError) as error:
                 await self.db.command("find", "t")
@@ -77,14 +81,12 @@ async def test_retry_overload_error_find(self):
         await self.db.t.insert_one({"x": 1})
 
         # Ensure command is retried on overload error.
-        fail_many = mock_overload_error.copy()
-        fail_many["mode"] = {"times": MAX_ADAPTIVE_RETRIES}
+        fail_many = get_mock_overload_error(MAX_ADAPTIVE_RETRIES)
         async with self.fail_point(fail_many):
             await self.db.t.find_one()
 
         # Ensure command stops retrying after MAX_ADAPTIVE_RETRIES.
-        fail_too_many = mock_overload_error.copy()
-        fail_too_many["mode"] = {"times": MAX_ADAPTIVE_RETRIES + 1}
+        fail_too_many = get_mock_overload_error(MAX_ADAPTIVE_RETRIES + 1)
         async with self.fail_point(fail_too_many):
             with self.assertRaises(PyMongoError) as error:
                 await self.db.t.find_one()
@@ -95,14 +97,12 @@ async def test_retry_overload_error_find(self):
     @async_client_context.require_failCommand_appName
     async def test_retry_overload_error_insert_one(self):
         # Ensure command is retried on overload error.
-        fail_many = mock_overload_error.copy()
-        fail_many["mode"] = {"times": MAX_ADAPTIVE_RETRIES}
+        fail_many = get_mock_overload_error(MAX_ADAPTIVE_RETRIES)
         async with self.fail_point(fail_many):
             await self.db.t.insert_one({"x": 1})
 
         # Ensure command stops retrying after MAX_ADAPTIVE_RETRIES.
-        fail_too_many = mock_overload_error.copy()
-        fail_too_many["mode"] = {"times": MAX_ADAPTIVE_RETRIES + 1}
+        fail_too_many = get_mock_overload_error(MAX_ADAPTIVE_RETRIES + 1)
         async with self.fail_point(fail_too_many):
             with self.assertRaises(PyMongoError) as error:
                 await self.db.t.insert_one({"x": 1})
@@ -117,14 +117,12 @@ async def test_retry_overload_error_update_many(self):
         await self.db.t.insert_one({"x": 1})
 
         # Ensure command is retried on overload error.
-        fail_many = mock_overload_error.copy()
-        fail_many["mode"] = {"times": MAX_ADAPTIVE_RETRIES}
+        fail_many = get_mock_overload_error(MAX_ADAPTIVE_RETRIES)
         async with self.fail_point(fail_many):
             await self.db.t.update_many({}, {"$set": {"x": 2}})
 
         # Ensure command stops retrying after MAX_ADAPTIVE_RETRIES.
-        fail_too_many = mock_overload_error.copy()
-        fail_too_many["mode"] = {"times": MAX_ADAPTIVE_RETRIES + 1}
+        fail_too_many = get_mock_overload_error(MAX_ADAPTIVE_RETRIES + 1)
         async with self.fail_point(fail_too_many):
             with self.assertRaises(PyMongoError) as error:
                 await self.db.t.update_many({}, {"$set": {"x": 2}})

test/test_client_backpressure.py

@@ -49,6 +49,12 @@
 }
 
 
+def get_mock_overload_error(times: int):
+    error = mock_overload_error.copy()
+    error["mode"] = {"times": times}
+    return error
+
+
 class TestBackpressure(IntegrationTest):
     RUN_ON_LOAD_BALANCER = True
 
@@ -57,14 +63,12 @@ def test_retry_overload_error_command(self):
         self.db.t.insert_one({"x": 1})
 
         # Ensure command is retried on overload error.
-        fail_many = mock_overload_error.copy()
-        fail_many["mode"] = {"times": MAX_ADAPTIVE_RETRIES}
+        fail_many = get_mock_overload_error(MAX_ADAPTIVE_RETRIES)
         with self.fail_point(fail_many):
             self.db.command("find", "t")
 
         # Ensure command stops retrying after MAX_ADAPTIVE_RETRIES.
-        fail_too_many = mock_overload_error.copy()
-        fail_too_many["mode"] = {"times": MAX_ADAPTIVE_RETRIES + 1}
+        fail_too_many = get_mock_overload_error(MAX_ADAPTIVE_RETRIES + 1)
         with self.fail_point(fail_too_many):
             with self.assertRaises(PyMongoError) as error:
                 self.db.command("find", "t")
@@ -77,14 +81,12 @@ def test_retry_overload_error_find(self):
         self.db.t.insert_one({"x": 1})
 
         # Ensure command is retried on overload error.
-        fail_many = mock_overload_error.copy()
-        fail_many["mode"] = {"times": MAX_ADAPTIVE_RETRIES}
+        fail_many = get_mock_overload_error(MAX_ADAPTIVE_RETRIES)
         with self.fail_point(fail_many):
             self.db.t.find_one()
 
         # Ensure command stops retrying after MAX_ADAPTIVE_RETRIES.
-        fail_too_many = mock_overload_error.copy()
-        fail_too_many["mode"] = {"times": MAX_ADAPTIVE_RETRIES + 1}
+        fail_too_many = get_mock_overload_error(MAX_ADAPTIVE_RETRIES + 1)
         with self.fail_point(fail_too_many):
             with self.assertRaises(PyMongoError) as error:
                 self.db.t.find_one()
@@ -95,14 +97,12 @@ def test_retry_overload_error_find(self):
     @client_context.require_failCommand_appName
     def test_retry_overload_error_insert_one(self):
         # Ensure command is retried on overload error.
-        fail_many = mock_overload_error.copy()
-        fail_many["mode"] = {"times": MAX_ADAPTIVE_RETRIES}
+        fail_many = get_mock_overload_error(MAX_ADAPTIVE_RETRIES)
         with self.fail_point(fail_many):
             self.db.t.insert_one({"x": 1})
 
         # Ensure command stops retrying after MAX_ADAPTIVE_RETRIES.
-        fail_too_many = mock_overload_error.copy()
-        fail_too_many["mode"] = {"times": MAX_ADAPTIVE_RETRIES + 1}
+        fail_too_many = get_mock_overload_error(MAX_ADAPTIVE_RETRIES + 1)
         with self.fail_point(fail_too_many):
             with self.assertRaises(PyMongoError) as error:
                 self.db.t.insert_one({"x": 1})
@@ -117,14 +117,12 @@ def test_retry_overload_error_update_many(self):
         self.db.t.insert_one({"x": 1})
 
         # Ensure command is retried on overload error.
-        fail_many = mock_overload_error.copy()
-        fail_many["mode"] = {"times": MAX_ADAPTIVE_RETRIES}
+        fail_many = get_mock_overload_error(MAX_ADAPTIVE_RETRIES)
         with self.fail_point(fail_many):
             self.db.t.update_many({}, {"$set": {"x": 2}})
 
         # Ensure command stops retrying after MAX_ADAPTIVE_RETRIES.
-        fail_too_many = mock_overload_error.copy()
-        fail_too_many["mode"] = {"times": MAX_ADAPTIVE_RETRIES + 1}
+        fail_too_many = get_mock_overload_error(MAX_ADAPTIVE_RETRIES + 1)
         with self.fail_point(fail_too_many):
             with self.assertRaises(PyMongoError) as error:
                 self.db.t.update_many({}, {"$set": {"x": 2}})