radosgw-admin: remove buckets before user

Otherwise user delete will fail.

diff --git a/teuthology/task/radosgw-admin.py b/teuthology/task/radosgw-admin.py
index 6c428465db1652e8142e49ded8268cf37186f192..e4d42c1118c61869913cfd4e68afdfd107d36254 100644 (file)
--- a/teuthology/task/radosgw-admin.py
+++ b/teuthology/task/radosgw-admin.py
@@ -310,7 +310,21 @@ def task(ctx, config):
     key = boto.s3.key.Key(bucket)
     key.set_contents_from_string('three')
 
-    # TESTCASE 'rm-user','user','rm','existing user','succeeds'
+    # TESTCASE 'rm-user-buckets','user','rm','existing user','fails, still has buckets'
+    (err, out) = rgwadmin(ctx, client, ['user', 'rm', '--uid', user])
+    assert err
+    # delete should fail
+    fails = False
+    try:
+        bucket.delete()
+    except:
+        fails = True
+    assert fails
+
+    key.delete()
+    bucket.delete()
+    
+    # TESTCASE 'rm-user','user','rm','existing user','fails, still has buckets'
     (err, out) = rgwadmin(ctx, client, ['user', 'rm', '--uid', user])
     assert not err