From 588e0c0e23f66eb35a056ad110404a97fa219a15 Mon Sep 17 00:00:00 2001 From: Yuval Lifshitz Date: Mon, 29 Apr 2019 10:33:06 +0300 Subject: [PATCH] rgw/pubsub: make sure bucket is empty before deletion Signed-off-by: Yuval Lifshitz --- src/test/rgw/rgw_multi/tests_ps.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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) -- 2.39.5