Skip to content

Commit 6053f4a

Browse files
authored
Revert "test: unskip list_backup_operations sample test (#170)" (#174)
This reverts commit 864f09c.
1 parent d59d502 commit 6053f4a

File tree

2 files changed

+8
-17
lines changed

2 files changed

+8
-17
lines changed

google/cloud/spanner_v1/instance.py

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
"""User friendly container for Cloud Spanner Instance."""
1616

17-
import google.api_core.operation
1817
import re
1918

2019
from google.cloud.spanner_admin_instance_v1 import Instance as InstancePB
@@ -466,7 +465,7 @@ def list_backup_operations(self, filter_="", page_size=None):
466465
page_iter = self._client.database_admin_api.list_backup_operations(
467466
request=request, metadata=metadata
468467
)
469-
return map(self._item_to_operation, page_iter)
468+
return page_iter
470469

471470
def list_database_operations(self, filter_="", page_size=None):
472471
"""List database operations for the instance.
@@ -494,18 +493,4 @@ def list_database_operations(self, filter_="", page_size=None):
494493
page_iter = self._client.database_admin_api.list_database_operations(
495494
request=request, metadata=metadata
496495
)
497-
return map(self._item_to_operation, page_iter)
498-
499-
def _item_to_operation(self, operation_pb):
500-
"""Convert an operation protobuf to the native object.
501-
:type operation_pb: :class:`~google.longrunning.operations.Operation`
502-
:param operation_pb: An operation returned from the API.
503-
:rtype: :class:`~google.api_core.operation.Operation`
504-
:returns: The next operation in the page.
505-
"""
506-
operations_client = self._client.database_admin_api.transport.operations_client
507-
metadata_type = _type_string_to_type_pb(operation_pb.metadata.type_url)
508-
response_type = _OPERATION_RESPONSE_TYPES[metadata_type]
509-
return google.api_core.operation.from_gapic(
510-
operation_pb, operations_client, response_type, metadata_type=metadata_type
511-
)
496+
return page_iter

samples/samples/backup_sample_test.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,12 @@ def test_restore_database(capsys):
7979
assert BACKUP_ID in out
8080

8181

82+
@pytest.mark.skip(
83+
reason=(
84+
"failing due to a production bug"
85+
"https://github.com/googleapis/python-spanner/issues/149"
86+
)
87+
)
8288
def test_list_backup_operations(capsys, spanner_instance):
8389
backup_sample.list_backup_operations(INSTANCE_ID, DATABASE_ID)
8490
out, _ = capsys.readouterr()

0 commit comments

Comments
 (0)