From: Jane Zhu <jzhu116@bloomberg.net>
Date: Tue, 18 Mar 2025 03:49:42 +0000 (+0000)
Subject: rgw: fix stacked delete marker test in test_rgw_versioning
X-Git-Tag: v20.3.0~287^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=84e2f2f321609aaf1510d4be06483d09c85f3744;p=ceph.git

rgw: fix stacked delete marker test in test_rgw_versioning

Signed-off-by: Jane Zhu <jzhu116@bloomberg.net>
---

diff --git a/qa/workunits/rgw/test_rgw_versioning.py b/qa/workunits/rgw/test_rgw_versioning.py
index f175203ea0bf..1eaab22494e0 100755
--- a/qa/workunits/rgw/test_rgw_versioning.py
+++ b/qa/workunits/rgw/test_rgw_versioning.py
@@ -58,9 +58,21 @@ def main():
     assert 'DeleteMarker' in resp, 'DeleteMarker key not present in response'
     assert resp['DeleteMarker'], 'DeleteMarker value not True in response'
     assert 'VersionId' in resp, 'VersionId key not present in response'
-    version_id = resp['VersionId']
-    bucket.Object(key).delete()
-    connection.ObjectVersion(bucket.name, key, version_id).delete()
+    version_id_1 = resp['VersionId']
+
+    resp = bucket.Object(key).delete()
+    assert 'DeleteMarker' in resp, 'DeleteMarker key not present in response'
+    assert resp['DeleteMarker'], 'DeleteMarker value not True in response'
+    assert 'VersionId' in resp, 'VersionId key not present in response'
+    version_id_2 = resp['VersionId']
+
+    connection.ObjectVersion(bucket.name, key, version_id_2).delete()
+    # bucket index should only include entries for an object version
+    out = exec_cmd(f'radosgw-admin bi list --bucket {BUCKET_NAME}')
+    json_out = json.loads(out.replace(b'\x80', b'0x80'))
+    assert len(json_out) == 4, 'bucket index did not only include entries for an object version'
+
+    connection.ObjectVersion(bucket.name, key, version_id_1).delete()
     # bucket index should now be empty
     out = exec_cmd(f'radosgw-admin bi list --bucket {BUCKET_NAME}')
     json_out = json.loads(out.replace(b'\x80', b'0x80'))