remove redundant clean up

Author: sleepyStick

test/asynchronous/test_retryable_writes.py

@@ -215,7 +215,6 @@ async def asyncTearDown(self):
     async def test_supported_single_statement_no_retry(self):
         listener = OvertCommandListener()
         client = await self.async_rs_or_single_client(retryWrites=False, event_listeners=[listener])
-        self.addAsyncCleanup(client.close)
         for method, args, kwargs in retryable_single_statement_ops(client.db.retryable_write_test):
             msg = f"{method.__name__}(*{args!r}, **{kwargs!r})"
             listener.reset()
@@ -328,7 +327,6 @@ async def test_retry_timeout_raises_original_error(self):
         """
         listener = OvertCommandListener()
         client = await self.async_rs_or_single_client(retryWrites=True, event_listeners=[listener])
-        self.addAsyncCleanup(client.close)
         topology = client._topology
         select_server = topology.select_server
 
@@ -455,7 +453,6 @@ async def test_retryable_writes_in_sharded_cluster_multiple_available(self):
         for mongos in async_client_context.mongos_seeds().split(","):
             client = await self.async_rs_or_single_client(mongos)
             set_fail_point(client, fail_command)
-            self.addAsyncCleanup(client.close)
             mongos_clients.append(client)
 
         listener = OvertCommandListener()
@@ -499,11 +496,10 @@ async def _setup_class(cls):
         }
 
     @async_client_context.require_version_min(4, 0)
-    # @client_knobs(heartbeat_frequency=0.05, min_heartbeat_interval=0.05)
+    @client_knobs(heartbeat_frequency=0.05, min_heartbeat_interval=0.05)
     async def test_RetryableWriteError_error_label(self):
         listener = OvertCommandListener()
         client = await self.async_rs_or_single_client(retryWrites=True, event_listeners=[listener])
-        self.addAsyncCleanup(client.close)
 
         # Ensure collection exists.
         await client.pymongo_test.testcoll.insert_one({})
@@ -564,7 +560,6 @@ async def test_pool_paused_error_is_retryable(self):
         client = await self.async_rs_or_single_client(
             maxPoolSize=1, event_listeners=[cmap_listener, cmd_listener]
         )
-        self.addAsyncCleanup(client.close)
         for _ in range(10):
             cmap_listener.reset()
             cmd_listener.reset()
@@ -630,7 +625,6 @@ async def test_returns_original_error_code(
             retryWrites=True, event_listeners=[cmd_listener]
         )
         await client.test.test.drop()
-        self.addAsyncCleanup(client.close)
         cmd_listener.reset()
         await client.admin.command(
             {
@@ -666,7 +660,6 @@ async def test_increment_transaction_id_without_sending_command(self):
         """
         listener = OvertCommandListener()
         client = await self.async_rs_or_single_client(retryWrites=True, event_listeners=[listener])
-        self.addAsyncCleanup(client.close)
         topology = client._topology
         select_server = topology.select_server
 

test/test_retryable_writes.py

@@ -215,7 +215,6 @@ def tearDown(self):
     def test_supported_single_statement_no_retry(self):
         listener = OvertCommandListener()
         client = self.rs_or_single_client(retryWrites=False, event_listeners=[listener])
-        self.addCleanup(client.close)
         for method, args, kwargs in retryable_single_statement_ops(client.db.retryable_write_test):
             msg = f"{method.__name__}(*{args!r}, **{kwargs!r})"
             listener.reset()
@@ -328,7 +327,6 @@ def test_retry_timeout_raises_original_error(self):
         """
         listener = OvertCommandListener()
         client = self.rs_or_single_client(retryWrites=True, event_listeners=[listener])
-        self.addCleanup(client.close)
         topology = client._topology
         select_server = topology.select_server
 
@@ -455,7 +453,6 @@ def test_retryable_writes_in_sharded_cluster_multiple_available(self):
         for mongos in client_context.mongos_seeds().split(","):
             client = self.rs_or_single_client(mongos)
             set_fail_point(client, fail_command)
-            self.addCleanup(client.close)
             mongos_clients.append(client)
 
         listener = OvertCommandListener()
@@ -499,11 +496,10 @@ def _setup_class(cls):
         }
 
     @client_context.require_version_min(4, 0)
-    # @client_knobs(heartbeat_frequency=0.05, min_heartbeat_interval=0.05)
+    @client_knobs(heartbeat_frequency=0.05, min_heartbeat_interval=0.05)
     def test_RetryableWriteError_error_label(self):
         listener = OvertCommandListener()
         client = self.rs_or_single_client(retryWrites=True, event_listeners=[listener])
-        self.addCleanup(client.close)
 
         # Ensure collection exists.
         client.pymongo_test.testcoll.insert_one({})
@@ -564,7 +560,6 @@ def test_pool_paused_error_is_retryable(self):
         client = self.rs_or_single_client(
             maxPoolSize=1, event_listeners=[cmap_listener, cmd_listener]
         )
-        self.addCleanup(client.close)
         for _ in range(10):
             cmap_listener.reset()
             cmd_listener.reset()
@@ -628,7 +623,6 @@ def test_returns_original_error_code(
         cmd_listener = InsertEventListener()
         client = self.rs_or_single_client(retryWrites=True, event_listeners=[cmd_listener])
         client.test.test.drop()
-        self.addCleanup(client.close)
         cmd_listener.reset()
         client.admin.command(
             {
@@ -664,7 +658,6 @@ def test_increment_transaction_id_without_sending_command(self):
         """
         listener = OvertCommandListener()
         client = self.rs_or_single_client(retryWrites=True, event_listeners=[listener])
-        self.addCleanup(client.close)
         topology = client._topology
         select_server = topology.select_server