From: Yuval Lifshitz <yuvalif@yahoo.com>
Date: Mon, 29 Apr 2019 07:33:06 +0000 (+0300)
Subject: rgw/pubsub: make sure bucket is empty before deletion
X-Git-Tag: v15.1.0~2764^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=588e0c0e23f66eb35a056ad110404a97fa219a15;p=ceph.git

rgw/pubsub: make sure bucket is empty before deletion

Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>
---

diff --git a/src/test/rgw/rgw_multi/tests_ps.py b/src/test/rgw/rgw_multi/tests_ps.py
index b31df060f03..d043d287632 100644
--- a/src/test/rgw/rgw_multi/tests_ps.py
+++ b/src/test/rgw/rgw_multi/tests_ps.py
@@ -892,19 +892,22 @@ def test_ps_versioned_deletion():
     # wait for sync
     zone_bucket_checkpoint(ps_zones[0].zone, zones[0].zone, bucket_name)
 
-    # get the create events from the subscription
+    # get the delete events from the subscription
     result, _ = sub_conf.get_events()
     parsed_result = json.loads(result)
     for event in parsed_result['events']:
         log.debug('Event key: "' + str(event['info']['key']['name']) + '" type: "' + str(event['event']) + '"')
+        assert_equal(str(event['event']), 'OBJECT_DELETE')
 
-    # TODO: verify the specific events
+    # TODO: verify we have exactly 2 events
     assert len(parsed_result['events']) >= 2
 
     # cleanup
     sub_conf.del_config()
     notification_conf.del_config()
     topic_conf.del_config()
+    for key in bucket.list():
+        key.delete()
     zones[0].delete_bucket(bucket_name)