Review changes

Signed-off-by: Mahesh Shetty <[email protected]>
red-hat-storage · Mar 13, 2024 · b7333fe · b7333fe
1 parent 277bfb1
commit b7333fe
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -7480,6 +7480,7 @@ def aws_log_based_replication_setup(
         MockupBucketLogger: A MockupBucketLogger object
         Bucket: The source bucket
         Bucket: The target bucket
+
     """
 
     reduce_replication_delay_setup()

diff --git a/tests/cross_functional/system_test/test_mcg_replication_with_disruptions.py b/tests/cross_functional/system_test/test_mcg_replication_with_disruptions.py
@@ -247,6 +247,16 @@ def test_replication_with_disruptions(
 @magenta_squad
 @skipif_vsphere_ipi
 class TestLogBasedReplicationWithDisruptions:
+    @retry(Exception, tries=10, delay=5)
+    def delete_objs_in_batch(self, objs_to_delete, mockup_logger, source_bucket):
+        """
+        This function deletes objects in a batch
+        """
+        for obj in objs_to_delete:
+            mockup_logger.delete_objs_and_log(source_bucket.name, [obj])
+            time.sleep(5)
+        logger.info(f"Successfully deleted these objects: {objs_to_delete}")
+
     @polarion_id("OCS-5457")
     @bugzilla("2266805")
     def test_log_based_replication_with_disruptions(
@@ -279,7 +289,6 @@ def test_log_based_replication_with_disruptions(
            make sure no replication - no deletion sync works
 
         """
-
         # entry criteria setup
         feature_setup_map = setup_mcg_bg_features(
             num_of_buckets=5,
@@ -305,17 +314,10 @@ def test_log_based_replication_with_disruptions(
         objs_in_bucket = mockup_logger.standard_test_obj_list
         objs_to_delete = random.sample(objs_in_bucket, 3)
 
-        from ocs_ci.utility.retry import retry
-
-        @retry(Exception, tries=10, delay=5)
-        def delete_objs_in_batch():
-            for obj in objs_to_delete:
-                mockup_logger.delete_objs_and_log(source_bucket.name, [obj])
-                time.sleep(5)
-            logger.info(f"Successfully deleted these objects: {objs_to_delete}")
-
         with ThreadPoolExecutor(max_workers=1) as executor:
-            future = executor.submit(delete_objs_in_batch)
+            future = executor.submit(
+                self.delete_objs_in_batch, objs_to_delete, mockup_logger, source_bucket
+            )
 
             # Restart noobaa pods
             nb_core_pod = get_noobaa_core_pod()