Merge pull request #2533 from tseaver/2529-pubsub-fix-server-side-timestamp

Use correct 'publishTime' field name for server-set message timestamp.

Author: tseaver

packages/google-cloud-pubsub/google/cloud/pubsub/message.py

@@ -89,5 +89,5 @@ def from_api_repr(cls, api_repr):
         instance = cls(
             data=data, message_id=api_repr['messageId'],
             attributes=api_repr.get('attributes'))
-        instance._service_timestamp = api_repr.get('publishTimestamp')
+        instance._service_timestamp = api_repr.get('publishTime')
         return instance

packages/google-cloud-pubsub/unit_tests/test_message.py

@@ -98,7 +98,7 @@ def test_from_api_repr_no_attributes(self):
         api_repr = {
             'data': B64_DATA,
             'messageId': MESSAGE_ID,
-            'publishTimestamp': TIMESTAMP,
+            'publishTime': TIMESTAMP,
         }
         message = self._getTargetClass().from_api_repr(api_repr)
         self.assertEqual(message.data, DATA)
@@ -116,7 +116,7 @@ def test_from_api_repr_w_attributes(self):
         api_repr = {
             'data': B64_DATA,
             'messageId': MESSAGE_ID,
-            'publishTimestamp': TIMESTAMP,
+            'publishTime': TIMESTAMP,
             'attributes': ATTRS,
         }
         message = self._getTargetClass().from_api_repr(api_repr)