TrueCloudLab/s3-tests
7
0
Fork 1
mirror of https://github.com/ceph/s3-tests.git synced 2025-02-16 11:16:31 +00:00
Code Issues 2 Projects Releases Packages Wiki Activity

Merge pull request #51 from andrewgaul/nuke-bucket-without-versions

Browse source 
Fall back when nuking buckets

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
This commit is contained in:
Yehuda Sadeh 2015-04-24 14:50:49 -07:00
commit e4dafa0cc2
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
s3tests/functional/__init__.py
View file

@ -67,7 +67,17 @@ def nuke_prefixed_buckets_on_conn(prefix, name, conn):
success = False
for i in xrange(2):
try:
for key in bucket.list_versions():
try:
iterator = iter(bucket.list_versions())
# peek into iterator to issue list operation
keys = itertools.chain([next(iterator)], iterator)
except boto.exception.S3ResponseError as e:
# some S3 implementations do not support object
# versioning - fall back to listing without versions
if e.error_code != 'NotImplemented':
raise e
keys = bucket.list();
for key in keys:
print 'Cleaning bucket {bucket} key {key}'.format(
bucket=bucket,
key=key,