Skip to content

Logging: harden systest teardown vs 'DeadlineExceeded' retry errors #6182

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
Oct 9, 2018
Merged

Logging: harden systest teardown vs 'DeadlineExceeded' retry errors #6182

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
4 changes: 3 additions & 1 deletion logging/tests/system/test_system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
from google.api_core.exceptions import NotFound
from google.api_core.exceptions import TooManyRequests
from google.api_core.exceptions import ResourceExhausted
from google.api_core.exceptions import RetryError
from google.api_core.exceptions import ServiceUnavailable
from google.cloud._helpers import UTC
import google.cloud.logging
Expand Down Expand Up @@ -104,7 +105,8 @@ def setUp(self):
self._handlers_cache = logging.getLogger().handlers[:]

def tearDown(self):
retry = RetryErrors((NotFound, TooManyRequests), max_tries=9)
retry = RetryErrors(
(NotFound, TooManyRequests, RetryError), max_tries=9)
for doomed in self.to_delete:
try:
retry(doomed.delete)()
Expand Down