Skip to content

Pub/Sub: quickstart sub.py update #2475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anguillanneuf merged 10 commits into from
Oct 21, 2019
Merged

Pub/Sub: quickstart sub.py update #2475

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a2f17aa
update sub.py & requirements.txt
anguillanneuf Oct 14, 2019
5c2e2a6
Merge branch 'master' into cps
anguillanneuf Oct 14, 2019
a9c4ff7
fix subscriber test
anguillanneuf Oct 15, 2019
7ca4628
rename future, sync deps
anguillanneuf Oct 15, 2019
95908f8
rewrite test with timeout
anguillanneuf Oct 15, 2019
16fafe6
resolve merge conflicts
anguillanneuf Oct 15, 2019
0da478d
fix var name
anguillanneuf Oct 15, 2019
554d342
typo
anguillanneuf Oct 15, 2019
5d599a5
remove flaky
anguillanneuf Oct 15, 2019
3a1da40
fix flaky test with separate subscriptions
anguillanneuf Oct 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pubsub/cloud-client/quickstart/sub.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ def callback(message):
# Calling result() on the StreamingPullFuture keeps the main thread alive
# while the callback function processes messages in the background.
try:
streaming_future.result()
streaming_pull_future.result()
except Exception as error:
streaming_future.cancel()
streaming_pull_future.cancel()
raise error


Expand Down
2 changes: 1 addition & 1 deletion pubsub/cloud-client/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-cloud-pubsub==1.0.2
google-cloud-pubsub==1.0.0
4 changes: 4 additions & 0 deletions pubsub/cloud-client/subscriber_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,11 @@ def new_sleep(period):
return mock.patch('time.sleep', new=new_sleep)


<<<<<<< HEAD
@pytest.fixture(scope='module')
=======
@flaky
>>>>>>> 5c2e2a6e6734da91246aec6aa48eb6316e5c47a5
def test_receive(publisher_client, topic, subscription, capsys):
_publish_messages(publisher_client, topic)

Expand Down