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

Harden logging systests #5496

Merged
merged 3 commits into from
Jun 14, 2018
+7 −3
Merged

Harden logging systests #5496

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6af394
Harden teardown against 429 TooManyRequests errors.
tseaver Jun 14, 2018
6382351
Harden bucket setup against 409 Conflict errors.
tseaver Jun 14, 2018
228bb8e
Harden dataset setup against transient errors.
tseaver Jun 14, 2018
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
10 changes: 7 additions & 3 deletions logging/tests/system/test_system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import logging
import unittest

from google.api_core.exceptions import BadGateway
from google.api_core.exceptions import Conflict
from google.api_core.exceptions import NotFound
from google.api_core.exceptions import TooManyRequests
Expand Down Expand Up @@ -102,7 +103,7 @@ def setUp(self):
self._handlers_cache = logging.getLogger().handlers[:]

def tearDown(self):
retry = RetryErrors(NotFound, max_tries=9)
retry = RetryErrors((NotFound, TooManyRequests), max_tries=9)
for doomed in self.to_delete:
try:
retry(doomed.delete)()
Expand Down Expand Up @@ -381,9 +382,10 @@ def _init_storage_bucket(self):

# Create the destination bucket, and set up the ACL to allow
# Stackdriver Logging to write into it.
retry = RetryErrors((Conflict, TooManyRequests, ServiceUnavailable))
storage_client = storage.Client()
bucket = storage_client.bucket(BUCKET_NAME)
retry_429(bucket.create)()
retry(bucket.create)()
self.to_delete.append(bucket)
bucket.acl.reload()
logs_group = bucket.acl.group('[email protected]')
Expand Down Expand Up @@ -441,9 +443,11 @@ def _init_bigquery_dataset(self):

# Create the destination dataset, and set up the ACL to allow
# Stackdriver Logging to write into it.
retry = RetryErrors((TooManyRequests, BadGateway, ServiceUnavailable))
bigquery_client = bigquery.Client()
dataset_ref = bigquery_client.dataset(dataset_name)
dataset = bigquery_client.create_dataset(bigquery.Dataset(dataset_ref))
dataset = retry(bigquery_client.create_dataset)(
bigquery.Dataset(dataset_ref))
self.to_delete.append((bigquery_client, dataset))
bigquery_client.get_dataset(dataset)
access = AccessEntry(
Expand Down