Fix pubsub regression test:

tseaver · tseaver · commit 37ad9e255b36 · 2015-04-06T21:38:26.000-04:00
Broken by rename of 'Message.attrs' -&gt; 'attributes'.
diff --git a/gcloud/pubsub/message.py b/gcloud/pubsub/message.py
@@ -35,14 +35,14 @@ class Message(object):
     def __init__(self, data, message_id, attributes=None):
         self.data = data
         self.message_id = message_id
-        self._attrs = attributes
+        self._attributes = attributes
 
     @property
-    def attrs(self):
+    def attributes(self):
         """Lazily-constructed attribute dictionary"""
-        if self._attrs is None:
-            self._attrs = {}
-        return self._attrs
+        if self._attributes is None:
+            self._attributes = {}
+        return self._attributes
 
     @classmethod
     def from_api_repr(cls, api_repr):
diff --git a/gcloud/pubsub/test_message.py b/gcloud/pubsub/test_message.py
@@ -24,25 +24,25 @@ def _getTargetClass(self):
     def _makeOne(self, *args, **kw):
         return self._getTargetClass()(*args, **kw)
 
-    def test_ctor_no_attrs(self):
+    def test_ctor_no_attributes(self):
         DATA = b'DEADBEEF'
         MESSAGE_ID = b'12345'
         message = self._makeOne(data=DATA, message_id=MESSAGE_ID)
         self.assertEqual(message.data, DATA)
         self.assertEqual(message.message_id, MESSAGE_ID)
-        self.assertEqual(message.attrs, {})
+        self.assertEqual(message.attributes, {})
 
-    def test_ctor_w_attrs(self):
+    def test_ctor_w_attributes(self):
         DATA = b'DEADBEEF'
         MESSAGE_ID = b'12345'
         ATTRS = {'a': 'b'}
         message = self._makeOne(data=DATA, message_id=MESSAGE_ID,
                                 attributes=ATTRS)
         self.assertEqual(message.data, DATA)
         self.assertEqual(message.message_id, MESSAGE_ID)
-        self.assertEqual(message.attrs, ATTRS)
+        self.assertEqual(message.attributes, ATTRS)
 
-    def test_from_api_repr_no_attrs(self):
+    def test_from_api_repr_no_attributes(self):
         from base64 import b64encode as b64
         DATA = b'DEADBEEF'
         B64_DATA = b64(DATA)
@@ -51,9 +51,9 @@ def test_from_api_repr_no_attrs(self):
         message = self._getTargetClass().from_api_repr(api_repr)
         self.assertEqual(message.data, DATA)
         self.assertEqual(message.message_id, MESSAGE_ID)
-        self.assertEqual(message.attrs, {})
+        self.assertEqual(message.attributes, {})
 
-    def test_from_api_repr_w_attrs(self):
+    def test_from_api_repr_w_attributes(self):
         from base64 import b64encode as b64
         DATA = b'DEADBEEF'
         B64_DATA = b64(DATA)
@@ -65,4 +65,4 @@ def test_from_api_repr_w_attrs(self):
         message = self._getTargetClass().from_api_repr(api_repr)
         self.assertEqual(message.data, DATA)
         self.assertEqual(message.message_id, MESSAGE_ID)
-        self.assertEqual(message.attrs, ATTRS)
+        self.assertEqual(message.attributes, ATTRS)
diff --git a/gcloud/pubsub/test_subscription.py b/gcloud/pubsub/test_subscription.py
@@ -269,7 +269,7 @@ def test_pull_wo_return_immediately_wo_max_messages(self):
         self.assertTrue(isinstance(message, Message))
         self.assertEqual(message.data, PAYLOAD)
         self.assertEqual(message.message_id, MSG_ID)
-        self.assertEqual(message.attrs, {})
+        self.assertEqual(message.attributes, {})
         self.assertEqual(len(conn._requested), 1)
         req = conn._requested[0]
         self.assertEqual(req['method'], 'POST')
@@ -300,7 +300,7 @@ def test_pull_w_return_immediately_w_max_messages(self):
         self.assertTrue(isinstance(message, Message))
         self.assertEqual(message.data, PAYLOAD)
         self.assertEqual(message.message_id, MSG_ID)
-        self.assertEqual(message.attrs, {'a': 'b'})
+        self.assertEqual(message.attributes, {'a': 'b'})
         self.assertEqual(len(conn._requested), 1)
         req = conn._requested[0]
         self.assertEqual(req['method'], 'POST')
