Skip to content
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

Jump to bottom

Harden 'create_bucket' call in systests vs. 429 TooManyRequests. #6401

Merged
merged 1 commit into from
Nov 6, 2018
Merged

Harden 'create_bucket' call in systests vs. 429 TooManyRequests. #6401

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
22 changes: 11 additions & 11 deletions storage/tests/system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ def test_bucket_update_labels(self):
@unittest.skipUnless(USER_PROJECT, 'USER_PROJECT not set in environment.')
def test_crud_bucket_with_requester_pays(self):
new_bucket_name = 'w-requester-pays' + unique_resource_id('-')
created = Config.CLIENT.create_bucket(
created = retry_429(Config.CLIENT.create_bucket)(
new_bucket_name, requester_pays=True)
self.case_buckets_to_delete.append(new_bucket_name)
self.assertEqual(created.name, new_bucket_name)
Expand Down Expand Up @@ -235,7 +235,7 @@ def test_crud_bucket_with_requester_pays(self):
@unittest.skipUnless(USER_PROJECT, 'USER_PROJECT not set in environment.')
def test_bucket_acls_iam_with_user_project(self):
new_bucket_name = 'acl-w-user-project' + unique_resource_id('-')
Config.CLIENT.create_bucket(
retry_429(Config.CLIENT.create_bucket)(
new_bucket_name, requester_pays=True)
self.case_buckets_to_delete.append(new_bucket_name)

Expand Down Expand Up @@ -273,7 +273,7 @@ def test_bucket_acls_iam_with_user_project(self):
@unittest.skipUnless(USER_PROJECT, 'USER_PROJECT not set in environment.')
def test_copy_existing_file_with_user_project(self):
new_bucket_name = 'copy-w-requester-pays' + unique_resource_id('-')
created = Config.CLIENT.create_bucket(
created = retry_429(Config.CLIENT.create_bucket)(
new_bucket_name, requester_pays=True)
self.case_buckets_to_delete.append(new_bucket_name)
self.assertEqual(created.name, new_bucket_name)
Expand Down Expand Up @@ -302,7 +302,7 @@ def test_copy_existing_file_with_user_project(self):
def test_bucket_get_blob_with_user_project(self):
new_bucket_name = 'w-requester-pays' + unique_resource_id('-')
data = b'DEADBEEF'
created = Config.CLIENT.create_bucket(
created = retry_429(Config.CLIENT.create_bucket)(
new_bucket_name, requester_pays=True)
self.case_buckets_to_delete.append(new_bucket_name)
self.assertEqual(created.name, new_bucket_name)
Expand Down Expand Up @@ -832,7 +832,7 @@ def test_compose_replace_existing_blob(self):
@unittest.skipUnless(USER_PROJECT, 'USER_PROJECT not set in environment.')
def test_compose_with_user_project(self):
new_bucket_name = 'compose-user-project' + unique_resource_id('-')
created = Config.CLIENT.create_bucket(
created = retry_429(Config.CLIENT.create_bucket)(
new_bucket_name, requester_pays=True)
try:
SOURCE_1 = b'AAA\n'
Expand Down Expand Up @@ -908,7 +908,7 @@ def test_rewrite_rotate_encryption_key(self):
def test_rewrite_add_key_with_user_project(self):
file_data = self.FILES['simple']
new_bucket_name = 'rewrite-key-up' + unique_resource_id('-')
created = Config.CLIENT.create_bucket(
created = retry_429(Config.CLIENT.create_bucket)(
new_bucket_name, requester_pays=True)
try:
with_user_project = Config.CLIENT.bucket(
Expand Down Expand Up @@ -936,7 +936,7 @@ def test_rewrite_rotate_with_user_project(self):
BLOB_NAME = 'rotating-keys'
file_data = self.FILES['simple']
new_bucket_name = 'rewrite-rotate-up' + unique_resource_id('-')
created = Config.CLIENT.create_bucket(
created = retry_429(Config.CLIENT.create_bucket)(
new_bucket_name, requester_pays=True)
try:
with_user_project = Config.CLIENT.bucket(
Expand Down Expand Up @@ -1293,7 +1293,7 @@ def test_bucket_w_retention_period(self):
period_secs = 10

new_bucket_name = 'w-retention-period' + unique_resource_id('-')
bucket = Config.CLIENT.create_bucket(new_bucket_name)
bucket = retry_429(Config.CLIENT.create_bucket)(new_bucket_name)
self.case_buckets_to_delete.append(new_bucket_name)

bucket.retention_period = period_secs
Expand Down Expand Up @@ -1343,7 +1343,7 @@ def test_bucket_w_default_event_based_hold(self):
new_bucket_name = 'w-def-ebh' + unique_resource_id('-')
self.assertRaises(exceptions.NotFound,
Config.CLIENT.get_bucket, new_bucket_name)
bucket = Config.CLIENT.create_bucket(new_bucket_name)
bucket = retry_429(Config.CLIENT.create_bucket)(new_bucket_name)
self.case_buckets_to_delete.append(new_bucket_name)

bucket.default_event_based_hold = True
Expand Down Expand Up @@ -1394,7 +1394,7 @@ def test_blob_w_temporary_hold(self):
new_bucket_name = 'w-tmp-hold' + unique_resource_id('-')
self.assertRaises(exceptions.NotFound,
Config.CLIENT.get_bucket, new_bucket_name)
bucket = Config.CLIENT.create_bucket(new_bucket_name)
bucket = retry_429(Config.CLIENT.create_bucket)(new_bucket_name)
self.case_buckets_to_delete.append(new_bucket_name)

blob_name = 'test-blob'
Expand Down Expand Up @@ -1427,7 +1427,7 @@ def test_bucket_lock_retention_policy(self):
new_bucket_name = 'loc-ret-policy' + unique_resource_id('-')
self.assertRaises(exceptions.NotFound,
Config.CLIENT.get_bucket, new_bucket_name)
bucket = Config.CLIENT.create_bucket(new_bucket_name)
bucket = retry_429(Config.CLIENT.create_bucket)(new_bucket_name)
self.case_buckets_to_delete.append(new_bucket_name)

bucket.retention_period = period_secs
Expand Down