rgw/pubsub: fix test issue with 3 zones

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 d043d2876322e1371640ce6f99d84591e9346b47..8177a7a8d79318384c23c65a3b4355e6b802c759 100644 (file)
--- a/src/test/rgw/rgw_multi/tests_ps.py
+++ b/src/test/rgw/rgw_multi/tests_ps.py
@@ -7,6 +7,7 @@ from .tests import get_realm, \
     zone_meta_checkpoint, \
     zone_bucket_checkpoint, \
     zone_data_checkpoint, \
+    zonegroup_bucket_checkpoint, \
     check_bucket_eq, \
     gen_bucket_name, \
     get_user, \
@@ -902,12 +903,16 @@ def test_ps_versioned_deletion():
     # TODO: verify we have exactly 2 events
     assert len(parsed_result['events']) >= 2
 
+    # follwing is needed for the cleanup in the case of 3-zones
+    # see: http://tracker.ceph.com/issues/39142
+    realm = get_realm()
+    zonegroup = realm.master_zonegroup()
+    zonegroup_conns = ZonegroupConns(zonegroup)
+    zonegroup_bucket_checkpoint(zonegroup_conns, bucket_name)
     # 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)