openstack
/
swift
Code Issues Proposed changes

Merge "tests: Tolerate NoSuchBucket errors when cleaning up"

This commit is contained in:
Zuul 2022-11-07 22:13:18 +00:00 committed by Gerrit Code Review
parent 052abed755 162847d151
commit 2c4222dc6e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/s3api/__init__.py
View File

@ -190,6 +190,8 @@ class BaseS3TestCase(unittest.TestCase):
try:
client.delete_bucket(Bucket=bucket_name)
except ClientError as e:
if 'NoSuchBucket' in str(e):
return
if 'BucketNotEmpty' not in str(e):
raise
# Something's gone sideways. Try harder
@ -208,6 +210,8 @@ class BaseS3TestCase(unittest.TestCase):
try:
client.delete_bucket(Bucket=bucket_name)
except ClientError as e:
if 'NoSuchBucket' in str(e):
return
if 'BucketNotEmpty' not in str(e):
raise
if time.time() > timeout: