Skip to content

Making sure bucket delete does not fail in regression tests. #563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dhermes merged 1 commit into from
Jan 22, 2015
Merged

Making sure bucket delete does not fail in regression tests. #563

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions regression/storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,20 @@ def setUpModule():
SHARED_BUCKETS['test_bucket'] = connection.create_bucket(bucket_name)


def safe_delete(bucket):
for key in bucket:
try:
key.delete()
except storage.exceptions.NotFound:
print('Delete failed with 404: %r' % (key,))

# Passing force=False does not try to delete the contained files.
bucket.delete(force=False)


def tearDownModule():
for bucket in SHARED_BUCKETS.values():
# Passing force=True also deletes all files.
bucket.delete(force=True)
safe_delete(bucket)


class TestStorage(unittest2.TestCase):
Expand Down