Merge pull request #1765 from tseaver/1756-pubsub-snippet_fixup

tseaver · tseaver · commit 023f31676f21 · 2016-04-28T11:27:10.000-04:00
Pubsub snippet fixups
diff --git a/docs/pubsub_snippets.py b/docs/pubsub_snippets.py
@@ -311,24 +311,21 @@ def subscription_pull(client, to_delete):
     subscription.create()
     to_delete.append(subscription)
 
-    # [START subscription_pull_none_pending]
-    pulled = subscription.pull(max_messages=1)
-    # [END subscription_pull_none_pending]
-    assert len(pulled) == 0
-
     # [START subscription_pull_return_immediately]
     pulled = subscription.pull(return_immediately=True)
     # [END subscription_pull_return_immediately]
-    assert len(pulled) == 0
+    assert len(pulled) == 0, "unexpected message"
 
     topic.publish(PAYLOAD1)
     topic.publish(PAYLOAD2, extra=EXTRA)
 
+    time.sleep(1)  # eventually-consistent
+
     # [START subscription_pull]
     pulled = subscription.pull(max_messages=2)
     # [END subscription_pull]
 
-    assert len(pulled) == 2
+    assert len(pulled) == 2, "eventual consistency"
 
     # [START subscription_modify_ack_deadline]
     for ack_id, _ in pulled:
diff --git a/gcloud/pubsub/connection.py b/gcloud/pubsub/connection.py
@@ -416,7 +416,7 @@ def subscription_pull(self, subscription_path, return_immediately=False,
             'maxMessages': max_messages,
         }
         response = conn.api_request(method='POST', path=path, data=data)
-        return response['receivedMessages']
+        return response.get('receivedMessages', ())
 
     def subscription_acknowledge(self, subscription_path, ack_ids):
         """API call:  acknowledge retrieved messages for the subscription.

Original file line number	Diff line number	Diff line change
`@@ -416,7 +416,7 @@ def subscription_pull(self, subscription_path, return_immediately=False,`
`416`	`416`	`'maxMessages': max_messages,`
`417`	`417`	`}`
`418`	`418`	`response = conn.api_request(method='POST', path=path, data=data)`
`419`		`- return response['receivedMessages']`
	`419`	`+ return response.get('receivedMessages', ())`
`420`	`420`
`421`	`421`	`def subscription_acknowledge(self, subscription_path, ack_ids):`
`422`	`422`	`"""API call: acknowledge retrieved messages for the subscription.`