PYTHON-5071 Fix configureFailPoint retry

Author: ShaneHarvey

test/__init__.py

@@ -934,9 +934,12 @@ def assertEqualReply(self, expected, actual, msg=None):
         self.assertEqual(sanitize_reply(expected), sanitize_reply(actual), msg)
 
     @staticmethod
-    def configure_fail_point(client, command_args):
+    def configure_fail_point(client, command_args, off=False):
         cmd = {"configureFailPoint": "failCommand"}
         cmd.update(command_args)
+        if off:
+            cmd["mode"] = "off"
+            cmd.pop("data", None)
         try:
             client.admin.command(cmd)
             return
@@ -949,13 +952,11 @@ def configure_fail_point(client, command_args):
 
     @contextmanager
     def fail_point(self, command_args):
-        name = command_args.get("configureFailPoint", "failCommand")
         self.configure_fail_point(client_context.client, command_args)
         try:
             yield
         finally:
-            cmd_off = {"configureFailPoint": name, "mode": "off"}
-            self.configure_fail_point(client_context.client, cmd_off)
+            self.configure_fail_point(client_context.client, command_args, off=True)
 
     @contextmanager
     def fork(

test/asynchronous/__init__.py

@@ -936,9 +936,12 @@ def assertEqualReply(self, expected, actual, msg=None):
         self.assertEqual(sanitize_reply(expected), sanitize_reply(actual), msg)
 
     @staticmethod
-    async def configure_fail_point(client, command_args):
+    async def configure_fail_point(client, command_args, off=False):
         cmd = {"configureFailPoint": "failCommand"}
         cmd.update(command_args)
+        if off:
+            cmd["mode"] = "off"
+            cmd.pop("data", None)
         try:
             await client.admin.command(cmd)
             return
@@ -951,13 +954,11 @@ async def configure_fail_point(client, command_args):
 
     @asynccontextmanager
     async def fail_point(self, command_args):
-        name = command_args.get("configureFailPoint", "failCommand")
         await self.configure_fail_point(async_client_context.client, command_args)
         try:
             yield
         finally:
-            cmd_off = {"configureFailPoint": name, "mode": "off"}
-            await self.configure_fail_point(async_client_context.client, cmd_off)
+            await self.configure_fail_point(async_client_context.client, command_args, off=True)
 
     @contextmanager
     def fork(

test/asynchronous/unified_format.py

@@ -1008,12 +1008,8 @@ async def __set_fail_point(self, client, command_args):
         if not async_client_context.test_commands_enabled:
             self.skipTest("Test commands must be enabled")
 
-        cmd_on = SON([("configureFailPoint", "failCommand")])
-        cmd_on.update(command_args)
-        await client.admin.command(cmd_on)
-        self.addAsyncCleanup(
-            client.admin.command, "configureFailPoint", cmd_on["configureFailPoint"], mode="off"
-        )
+        await self.configure_fail_point(client, command_args)
+        self.addAsyncCleanup(self.configure_fail_point, client, command_args, off=True)
 
     async def _testOperation_failPoint(self, spec):
         await self.__set_fail_point(

test/unified_format.py

@@ -999,12 +999,8 @@ def __set_fail_point(self, client, command_args):
         if not client_context.test_commands_enabled:
             self.skipTest("Test commands must be enabled")
 
-        cmd_on = SON([("configureFailPoint", "failCommand")])
-        cmd_on.update(command_args)
-        client.admin.command(cmd_on)
-        self.addCleanup(
-            client.admin.command, "configureFailPoint", cmd_on["configureFailPoint"], mode="off"
-        )
+        self.configure_fail_point(client, command_args)
+        self.addCleanup(self.configure_fail_point, client, command_args, off=True)
 
     def _testOperation_failPoint(self, spec):
         self.__set_fail_point(