From fe734b5721c00daf151b2e27c459a42fce54893c Mon Sep 17 00:00:00 2001 From: Tianzi Cai Date: Thu, 9 Aug 2018 17:54:03 -0700 Subject: [PATCH 1/3] Updated library version --- pubsub/cloud-client/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubsub/cloud-client/requirements.txt b/pubsub/cloud-client/requirements.txt index c74eb4e3ccc1..23ed91dd2cc9 100644 --- a/pubsub/cloud-client/requirements.txt +++ b/pubsub/cloud-client/requirements.txt @@ -1 +1 @@ -google-cloud-pubsub==0.33.0 +google-cloud-pubsub==0.35.0 From efa6df120db05dfb725ffd672eff6d5f3518ba4c Mon Sep 17 00:00:00 2001 From: Tianzi Cai Date: Fri, 10 Aug 2018 15:11:33 -0700 Subject: [PATCH 2/3] Rewrote test for publish with error handler --- pubsub/cloud-client/publisher_test.py | 21 ++++++++++++++++++++- pubsub/cloud-client/subscriber.py | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/pubsub/cloud-client/publisher_test.py b/pubsub/cloud-client/publisher_test.py index 2eda09c6c185..cdb4d0e0e766 100644 --- a/pubsub/cloud-client/publisher_test.py +++ b/pubsub/cloud-client/publisher_test.py @@ -13,9 +13,11 @@ # limitations under the License. import os +import time from gcp_devrel.testing import eventually_consistent from google.cloud import pubsub_v1 +import mock import pytest import publisher @@ -43,6 +45,19 @@ def topic(client): yield topic_path +def _make_sleep_patch(): + real_sleep = time.sleep + + def new_sleep(period): + if period == 60: + real_sleep(5) + raise RuntimeError('sigil') + else: + real_sleep(period) + + return mock.patch('time.sleep', new=new_sleep) + + def test_list(client, topic, capsys): @eventually_consistent.call def _(): @@ -96,7 +111,11 @@ def test_publish_with_batch_settings(topic, capsys): def test_publish_with_error_handler(topic, capsys): - publisher.publish_messages_with_error_handler(PROJECT, TOPIC) + + with _make_sleep_patch(): + with pytest.raises(RuntimeError, match='sigil'): + publisher.publish_messages_with_error_handler( + PROJECT, TOPIC) out, _ = capsys.readouterr() assert 'Published' in out diff --git a/pubsub/cloud-client/subscriber.py b/pubsub/cloud-client/subscriber.py index 34f2301d85ba..46bb5118843b 100644 --- a/pubsub/cloud-client/subscriber.py +++ b/pubsub/cloud-client/subscriber.py @@ -191,7 +191,7 @@ def receive_messages_with_flow_control(project, subscription_name): project, subscription_name) def callback(message): - print('Received message: {}'.format(message)) + print('Received message: {}'.format(message.data)) message.ack() # Limit the subscriber to only have ten outstanding messages at a time. From 31476d597435fcb786f15001cc1c638d78ab76cd Mon Sep 17 00:00:00 2001 From: Tianzi Cai Date: Fri, 10 Aug 2018 15:46:20 -0700 Subject: [PATCH 3/3] Custom _publish function in test prints no 'Attributes' --- pubsub/cloud-client/subscriber_test.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pubsub/cloud-client/subscriber_test.py b/pubsub/cloud-client/subscriber_test.py index f04373ae8021..adbc44e84258 100644 --- a/pubsub/cloud-client/subscriber_test.py +++ b/pubsub/cloud-client/subscriber_test.py @@ -171,7 +171,6 @@ def test_receive_with_custom_attributes( out, _ = capsys.readouterr() assert 'Test message' in out - assert 'Attributes' in out assert 'origin' in out assert 'python-sample' in out