From: Andrew Gaul <andrew@gaul.org>
Date: Fri, 1 May 2015 20:09:51 +0000 (-0700)
Subject: Handle empty bucket while nuking
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F52%2Fhead;p=s3-tests.git

Handle empty bucket while nuking

Signed-off-by: Andrew Gaul <andrew@gaul.org>
---

diff --git a/s3tests/functional/__init__.py b/s3tests/functional/__init__.py
index 9681099c..68f27bd4 100644
--- a/s3tests/functional/__init__.py
+++ b/s3tests/functional/__init__.py
@@ -70,7 +70,10 @@ def nuke_prefixed_buckets_on_conn(prefix, name, conn):
                     try:
                         iterator = iter(bucket.list_versions())
                         # peek into iterator to issue list operation
-                        keys = itertools.chain([next(iterator)], iterator)
+                        try:
+                            keys = itertools.chain([next(iterator)], iterator)
+                        except StopIteration:
+                            keys = []  # empty iterator
                     except boto.exception.S3ResponseError as e:
                         # some S3 implementations do not support object
                         # versioning - fall back to listing without versions