Skip to content

ci: harden schema sample teardown against 500 InternalServiceError #519

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
gcf-merge-on-green merged 2 commits into from
Oct 8, 2021
Merged

ci: harden schema sample teardown against 500 InternalServiceError #519

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36f44e0
ci: harden schema teardown against 500 InternalServiceError
tseaver Oct 7, 2021
85c33b2
Merge branch 'main' into 388-samples-harden-schema-teardown
tseaver Oct 8, 2021
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
9 changes: 6 additions & 3 deletions samples/snippets/schema_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@

from _pytest.capture import CaptureFixture
from flaky import flaky
from google.api_core.exceptions import InternalServerError
from google.api_core.exceptions import NotFound
from google.cloud import pubsub_v1
from google.cloud.pubsub import PublisherClient, SchemaServiceClient, SubscriberClient
from google.cloud.pubsub import PublisherClient
from google.cloud.pubsub import SchemaServiceClient
from google.cloud.pubsub import SubscriberClient
from google.pubsub_v1.types import Encoding
import pytest

Expand Down Expand Up @@ -59,7 +62,7 @@ def avro_schema(

try:
schema_client.delete_schema(request={"name": avro_schema_path})
except NotFound:
except (NotFound, InternalServerError):
pass


Expand All @@ -73,7 +76,7 @@ def proto_schema(

try:
schema_client.delete_schema(request={"name": proto_schema_path})
except NotFound:
except (NotFound, InternalServerError):
pass


Expand Down