Skip to content

Fix Gax marshalling of Subscription protobufs. #1798

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
May 16, 2016
Merged

Fix Gax marshalling of Subscription protobufs. #1798

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
6 changes: 3 additions & 3 deletions gcloud/pubsub/_gax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,11 +422,11 @@ def _subscription_pb_to_mapping(sub_pb):
mapping = {
'name': sub_pb.name,
'topic': sub_pb.topic,
'ack_deadline': sub_pb.ack_deadline,
'ackDeadlineSeconds': sub_pb.ack_deadline_seconds,
}
if sub_pb.push_config.push_endpoint != '':
mapping['push_config'] = {
'push_endpoint': sub_pb.push_config.push_endpoint,
mapping['pushConfig'] = {
'pushEndpoint': sub_pb.push_config.push_endpoint,
}
return mapping

Expand Down
20 changes: 12 additions & 8 deletions gcloud/pubsub/test__gax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,9 +303,9 @@ def test_list_subscriptions_no_paging(self):
self.assertIsInstance(subscription, dict)
self.assertEqual(subscription['name'], self.SUB_PATH)
self.assertEqual(subscription['topic'], self.TOPIC_PATH)
self.assertEqual(subscription['push_config'],
{'push_endpoint': self.PUSH_ENDPOINT})
self.assertEqual(subscription['ack_deadline'], 0)
self.assertEqual(subscription['pushConfig'],
{'pushEndpoint': self.PUSH_ENDPOINT})
self.assertEqual(subscription['ackDeadlineSeconds'], 0)
self.assertEqual(next_token, None)

name, options = gax_api._list_subscriptions_called_with
Expand All @@ -322,7 +322,7 @@ def test_subscription_create(self):
expected = {
'name': self.SUB_PATH,
'topic': self.TOPIC_PATH,
'ack_deadline': 0,
'ackDeadlineSeconds': 0,
}
self.assertEqual(resource, expected)
name, topic, push_config, ack_deadline, options = (
Expand Down Expand Up @@ -368,7 +368,8 @@ def test_subscription_create_error(self):
self.assertEqual(options, None)

def test_subscription_get_hit(self):
sub_pb = _SubscriptionPB(self.SUB_PATH, self.TOPIC_PATH, '', 0)
sub_pb = _SubscriptionPB(
self.SUB_PATH, self.TOPIC_PATH, self.PUSH_ENDPOINT, 0)
gax_api = _GAXSubscriberAPI(_get_subscription_response=sub_pb)
api = self._makeOne(gax_api)

Expand All @@ -377,7 +378,10 @@ def test_subscription_get_hit(self):
expected = {
'name': self.SUB_PATH,
'topic': self.TOPIC_PATH,
'ack_deadline': 0,
'ackDeadlineSeconds': 0,
'pushConfig': {
'pushEndpoint': self.PUSH_ENDPOINT,
},
}
self.assertEqual(resource, expected)
sub_path, options = gax_api._get_subscription_called_with
Expand Down Expand Up @@ -851,11 +855,11 @@ def __init__(self, received_messages):

class _SubscriptionPB(object):

def __init__(self, name, topic, push_endpoint, ack_deadline):
def __init__(self, name, topic, push_endpoint, ack_deadline_seconds):
self.name = name
self.topic = topic
self.push_config = _PushConfigPB(push_endpoint)
self.ack_deadline = ack_deadline
self.ack_deadline_seconds = ack_deadline_seconds


class _ListSubscriptionsResponsePB(object):
Expand Down