From aa05874e67e3b52bbb9bc071b61beeb59c7c29e1 Mon Sep 17 00:00:00 2001 From: Charles Engelke Date: Wed, 12 Dec 2018 19:44:07 -0800 Subject: [PATCH] Fix update test to use new endpoint [(#1925)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/1925) * Fix update test to use new endpoint * Handle subscription already exists Previous deletions don't always succeed * Use a new endpoint for update --- samples/snippets/subscriber_test.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/samples/snippets/subscriber_test.py b/samples/snippets/subscriber_test.py index 3f5de61de..df5b1092b 100644 --- a/samples/snippets/subscriber_test.py +++ b/samples/snippets/subscriber_test.py @@ -17,6 +17,7 @@ from gcp_devrel.testing import eventually_consistent from google.cloud import pubsub_v1 +import google.api_core.exceptions import mock import pytest @@ -28,6 +29,7 @@ SUBSCRIPTION_SYNC1 = 'subscription-test-subscription-sync1' SUBSCRIPTION_SYNC2 = 'subscription-test-subscription-sync2' ENDPOINT = 'https://{}.appspot.com/push'.format(PROJECT) +NEW_ENDPOINT = 'https://{}.appspot.com/push2'.format(PROJECT) @pytest.fixture(scope='module') @@ -64,7 +66,10 @@ def subscription(subscriber_client, topic): except Exception: pass - subscriber_client.create_subscription(subscription_path, topic=topic) + try: + subscriber_client.create_subscription(subscription_path, topic=topic) + except google.api_core.exceptions.AlreadyExists: + pass yield subscription_path @@ -155,13 +160,10 @@ def _(): def test_update(subscriber_client, subscription, capsys): - ACK_DEADLINE_SECONDS = 100 - - subscriber.update_subscription(PROJECT, SUBSCRIPTION, ACK_DEADLINE_SECONDS) + subscriber.update_subscription(PROJECT, SUBSCRIPTION, NEW_ENDPOINT) out, _ = capsys.readouterr() - assert subscription in out - assert '100' in out + assert 'Subscription updated' in out def _publish_messages(publisher_client, topic):