From: oozmen Date: Mon, 11 May 2026 14:45:37 +0000 (-0400) Subject: tentacle: qa/rgw/multisite: remove duplicate test_suspended_delete_marker_incremental... X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c09933eb8d5cc09cca78c039297e7af5f38cef63;p=ceph.git tentacle: qa/rgw/multisite: remove duplicate test_suspended_delete_marker_incremental_sync PR #67318 (boto3 migration) cherry-picked onto tentacle conflicted with PR #66168 which had added test_suspended_delete_marker_incremental_sync using the old boto API. The conflict resolution added the boto3-rewritten version of the function but left the original old-API version in place, resulting in dup definitions with the same name. Remove the stale old-API duplicate; keep the boto3 version added by PR #67318. Fixes: https://tracker.ceph.com/issues/76505 Signed-off-by: Oguzhan Ozmen --- diff --git a/src/test/rgw/rgw_multi/tests.py b/src/test/rgw/rgw_multi/tests.py index 8cad5fe8ecc6..d98ed962d7ce 100644 --- a/src/test/rgw/rgw_multi/tests.py +++ b/src/test/rgw/rgw_multi/tests.py @@ -1270,32 +1270,6 @@ def test_suspended_delete_marker_incremental_sync(): zonegroup_bucket_checkpoint(zonegroup_conns, bucket.name) -def test_suspended_delete_marker_incremental_sync(): - zonegroup = realm.master_zonegroup() - zonegroup_conns = ZonegroupConns(zonegroup) - zone = zonegroup_conns.rw_zones[0] - - # create a versioned bucket - bucket = zone.create_bucket(gen_bucket_name()) - log.debug('created bucket=%s', bucket.name) - bucket.configure_versioning(True) - bucket.configure_versioning(False) - - zonegroup_meta_checkpoint(zonegroup) - - obj = 'obj' - - # upload a dummy object and wait for sync. this forces each zone to finish - # a full sync and switch to incremental - new_key(zone, bucket, obj).set_contents_from_string('') - zonegroup_bucket_checkpoint(zonegroup_conns, bucket.name) - - # create several a delete marker on source zone and let it sync - key = new_key(zone, bucket, obj) - key.delete() - - zonegroup_bucket_checkpoint(zonegroup_conns, bucket.name) - def test_bucket_versioning(): buckets, zone_bucket = create_bucket_per_zone_in_realm() for zone, bucket in zone_bucket: