From de65c582b77099c3bf8ab309bf3216a6a6f1cb34 Mon Sep 17 00:00:00 2001
From: "Robin H. Johnson" <robin.johnson@dreamhost.com>
Date: Tue, 1 Dec 2015 17:25:06 -0800
Subject: [PATCH] s3tests: do not exit cleanup after first bucket!

Bucket cleanup code was exiting after the first succesful bucket
removed, instead of cleaning up all buckets. This left many buckets
behind over time, causing large slowdowns of the test suite.

This was introduced in commit c41ebab9cf93617f06084cf88c297188b4aa9f67,
when changes for versioned files were added.

Signed-off-by: Kobi Laredo <kobi.laredo@dreamhost.com>
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
Backport: hammer
---
 s3tests/functional/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/s3tests/functional/__init__.py b/s3tests/functional/__init__.py
index 68f27bd..a5917e1 100644
--- a/s3tests/functional/__init__.py
+++ b/s3tests/functional/__init__.py
@@ -98,7 +98,7 @@ def nuke_prefixed_buckets_on_conn(prefix, name, conn):
                     pass
 
                 if success:
-                    return
+                    break
 
                 bucket.set_canned_acl('private')