fix tests

Author: abbrowne126

google/cloud/pubsub_v1/subscriber/_protocol/streaming_pull_manager.py

@@ -173,7 +173,7 @@ def _wrap_callback_errors(
         # unrecoverable state and this thread should just bail.
 
         _CALLBACK_EXCEPTION_LOGGER.exception(
-            "Message (id=%s, ack_id=%s, ordering_key=%s, exactly_once=%s)'s callback threw exception %s, nacking message.",
+            "Message (id=%s, ack_id=%s, ordering_key=%s, exactly_once=%s)'s callback threw exception, nacking message.",
             message.message_id,
             message.ack_id,
             message.ordering_key,

google/cloud/pubsub_v1/subscriber/message.py

@@ -133,7 +133,7 @@ def __init__(
         self._delivery_attempt = delivery_attempt if delivery_attempt > 0 else None
         self._request_queue = request_queue
         self._exactly_once_delivery_enabled_func = exactly_once_delivery_enabled_func
-        self.message_id = message.message_id
+        self._message_id = message.message_id
 
         # The instantiation time is the time that this message
         # was received. Tracking this provides us a way to be smart about
@@ -231,6 +231,11 @@ def ack_id(self) -> str:
         """the ID used to ack the message."""
         return self._ack_id
 
+    @property
+    def message_id(self) -> str:
+        """The message id of the message"""
+        return self._message_id
+
     @property
     def delivery_attempt(self) -> Optional[int]:
         """The delivery attempt counter is 1 + (the sum of number of NACKs

tests/unit/pubsub_v1/subscriber/test_message.py

@@ -289,6 +289,7 @@ def test_ack():
         msg.ack()
         put.assert_called_once_with(
             requests.AckRequest(
+                message_id=msg.message_id,
                 ack_id="bogus_ack_id",
                 byte_size=30,
                 time_to_ack=mock.ANY,
@@ -305,6 +306,7 @@ def test_ack_with_response_exactly_once_delivery_disabled():
         future = msg.ack_with_response()
         put.assert_called_once_with(
             requests.AckRequest(
+                message_id=msg.message_id,
                 ack_id="bogus_ack_id",
                 byte_size=30,
                 time_to_ack=mock.ANY,
@@ -325,6 +327,7 @@ def test_ack_with_response_exactly_once_delivery_enabled():
         future = msg.ack_with_response()
         put.assert_called_once_with(
             requests.AckRequest(
+                message_id=msg.message_id,
                 ack_id="bogus_ack_id",
                 byte_size=30,
                 time_to_ack=mock.ANY,
@@ -350,7 +353,12 @@ def test_modify_ack_deadline():
     with mock.patch.object(msg._request_queue, "put") as put:
         msg.modify_ack_deadline(60)
         put.assert_called_once_with(
-            requests.ModAckRequest(ack_id="bogus_ack_id", seconds=60, future=None)
+            requests.ModAckRequest(
+                message_id=msg.message_id,
+                ack_id="bogus_ack_id",
+                seconds=60,
+                future=None,
+            )
         )
         check_call_types(put, requests.ModAckRequest)
 
@@ -360,7 +368,12 @@ def test_modify_ack_deadline_with_response_exactly_once_delivery_disabled():
     with mock.patch.object(msg._request_queue, "put") as put:
         future = msg.modify_ack_deadline_with_response(60)
         put.assert_called_once_with(
-            requests.ModAckRequest(ack_id="bogus_ack_id", seconds=60, future=None)
+            requests.ModAckRequest(
+                message_id=msg.message_id,
+                ack_id="bogus_ack_id",
+                seconds=60,
+                future=None,
+            )
         )
         assert future.result() == AcknowledgeStatus.SUCCESS
         assert future == message._SUCCESS_FUTURE
@@ -374,7 +387,12 @@ def test_modify_ack_deadline_with_response_exactly_once_delivery_enabled():
     with mock.patch.object(msg._request_queue, "put") as put:
         future = msg.modify_ack_deadline_with_response(60)
         put.assert_called_once_with(
-            requests.ModAckRequest(ack_id="bogus_ack_id", seconds=60, future=future)
+            requests.ModAckRequest(
+                message_id=msg.message_id,
+                ack_id="bogus_ack_id",
+                seconds=60,
+                future=future,
+            )
         )
         check_call_types(put, requests.ModAckRequest)