]> git-server-git.apps.pok.os.sepia.ceph.com Git - s3-tests.git/commitdiff
Handle empty bucket while nuking 52/head
authorAndrew Gaul <andrew@gaul.org>
Fri, 1 May 2015 20:09:51 +0000 (13:09 -0700)
committerAndrew Gaul <andrew@gaul.org>
Fri, 1 May 2015 20:10:58 +0000 (13:10 -0700)
Signed-off-by: Andrew Gaul <andrew@gaul.org>
s3tests/functional/__init__.py

index 9681099c312480551153c4083e6d999f13ab4c7f..68f27bd46a86f9893a66a0d0e79615a66bf3fed1 100644 (file)
@@ -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