Skip to content

Storage: un-flake KMS integration tests expecting empty bucket. #7479

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
tseaver merged 1 commit into from
Mar 5, 2019
Merged

Storage: un-flake KMS integration tests expecting empty bucket. #7479

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
Un-flake KMS integration tests expecting empty bucket. 
Also, try even harder to delete the shared bucket.

Closes #7478.
  • Loading branch information
@tseaver
tseaver committed Mar 4, 2019
commit 0a06f8ec19f76d436b33c024ed4c43da442921d6
3 changes: 2 additions & 1 deletion storage/tests/system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def setUpModule():

def tearDownModule():
errors = (exceptions.Conflict, exceptions.TooManyRequests)
retry = RetryErrors(errors, max_tries=6)
retry = RetryErrors(errors, max_tries=9)
retry(Config.TEST_BUCKET.delete)(force=True)


Expand Down Expand Up @@ -1148,6 +1148,7 @@ def _kms_key_name(self, key_name=None):
@classmethod
def setUpClass(cls):
super(TestKMSIntegration, cls).setUpClass()
_empty_bucket(cls.bucket)

def setUp(self):
super(TestKMSIntegration, self).setUp()
Expand Down