Skip to content

Remove legacy HttpError usage in Bigtable I/O IT test #39441

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

Open
jrmccluskey wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −5
Open

Remove legacy HttpError usage in Bigtable I/O IT test #39441

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
10 changes: 5 additions & 5 deletions sdks/python/apache_beam/io/gcp/bigtableio_it_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

# Protect against environments where bigtable library is not available.
try:
from apitools.base.py.exceptions import HttpError
from google.api_core.exceptions import GoogleAPICallError
from google.cloud.bigtable import client
from google.cloud.bigtable.row import Cell
from google.cloud.bigtable.row import DirectRow
Expand All @@ -48,7 +48,7 @@
from google.cloud.bigtable_admin_v2.types import instance
except ImportError as e:
client = None
HttpError = None
GoogleAPICallError = None


def instance_prefix(instance):
Expand Down Expand Up @@ -109,7 +109,7 @@ def tearDown(self):
self.instance.instance_id)
self.table.delete()
self.instance.delete()
except HttpError:
except GoogleAPICallError:
_LOGGER.warning(
"Failed to clean up table [%s] and instance [%s]",
self.table.table_id,
Expand Down Expand Up @@ -208,15 +208,15 @@ def tearDown(self):
try:
_LOGGER.info("Deleting table [%s]", self.table.table_id)
self.table.delete()
except HttpError:
except GoogleAPICallError:
_LOGGER.warning("Failed to clean up table [%s]", self.table.table_id)

@classmethod
def tearDownClass(cls):
try:
_LOGGER.info("Deleting instance [%s]", cls.instance.instance_id)
cls.instance.delete()
except HttpError:
except GoogleAPICallError:
_LOGGER.warning(
"Failed to clean up instance [%s]", cls.instance.instance_id)

Expand Down
Loading