Skip to content

Adjust Spanner tests for grpcio 1.2.0 #3178

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
lukesneeringer merged 1 commit into from
Mar 21, 2017
Merged

Adjust Spanner tests for grpcio 1.2.0 #3178

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion spanner/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

REQUIREMENTS = [
'google-cloud-core >= 0.23.1, < 0.24dev',
'grpcio >= 1.0.2, < 2.0dev',
'grpcio >= 1.2.0, < 2.0dev',
'gapic-google-cloud-spanner-v1 >= 0.15.0, < 0.16dev',
'gapic-google-cloud-spanner-admin-database-v1 >= 0.15.0, < 0.16dev',
'gapic-google-cloud-spanner-admin-instance-v1 >= 0.15.0, < 0.16dev',
Expand Down
6 changes: 3 additions & 3 deletions spanner/unit_tests/test_session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,15 +847,15 @@ def begin_transaction(self, session, options_, options=None):
def _trailing_metadata(self):
from google.protobuf.duration_pb2 import Duration
from google.rpc.error_details_pb2 import RetryInfo
from grpc._common import cygrpc_metadata
from grpc._common import to_cygrpc_metadata

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view


if self._commit_abort_retry_nanos is None:
return cygrpc_metadata(())
return to_cygrpc_metadata(())
retry_info = RetryInfo(
retry_delay=Duration(
seconds=self._commit_abort_retry_seconds,
nanos=self._commit_abort_retry_nanos))
return cygrpc_metadata([
return to_cygrpc_metadata([
('google.rpc.retryinfo-bin', retry_info.SerializeToString())])

def commit(self, session, mutations,
Expand Down