Merge pull request #699 from ckulal/fix_mp_tags

Fix failure seen with multipart tagset

Author: mergify[bot]

rgw/v2/tests/s3_swift/configs/test_multipart_upload_with_tagging.yaml

@@ -6,7 +6,6 @@ config:
   user_count: 1
   bucket_count: 1
   objects_count: 1
-  abort_multipart: false
   split_size: 200
   objects_size_range:
     min: 1G

rgw/v2/tests/s3_swift/test_LargeObjGet_GC.py

@@ -43,7 +43,7 @@ def test_exec(config, ssh_con):
     rgw_conn = auth.do_auth()
     rgw_conn2 = auth.do_auth_using_client()
     log.info("no of buckets to create: %s" % config.bucket_count)
-    abort_multipart = (config.abort_multipart, False)
+    abort_multipart = config.abort_multipart
     # create buckets
     if config.test_ops["create_bucket"] is True:
         for bc in range(config.bucket_count):

rgw/v2/tests/s3_swift/test_Mbuckets_with_Nobjects.py

@@ -969,14 +969,13 @@ def test_exec(config, ssh_con):
         if config.test_ops.get("multipart_upload_with_tag", False):
             log.info("Testing tag retrival post multipart upload")
             obj_tag = "mpupload=mpupload"
-            abort_multipart = (config.abort_multipart, False)
             object_parts_info = reusable.upload_mutipart_object(
                 s3_object_name,
                 bucket,
                 TEST_DATA_PATH,
                 config,
                 each_user,
-                abort_multipart=abort_multipart,
+                abort_multipart=config.abort_multipart,
                 obj_tag=obj_tag,
             )
 

rgw/v2/tests/s3_swift/test_bucket_lifecycle_config_ops.py

@@ -79,7 +79,7 @@ def test_exec(config, ssh_con):
             log.info("RGW service restarted")
 
     # create user
-    abort_multipart = (config.abort_multipart, False)
+    abort_multipart = config.abort_multipart
     all_users_info = s3lib.create_users(config.user_count)
     for each_user in all_users_info:
         # authenticate