Merge pull request #24 from ONSdigital/pubsub-check

Use the recommended pattern of checking for failed publishing to pubsub
ONSdigital · May 28, 2019 · f2a9e16 · f2a9e16
2 parents 5a7ef7d + 0225066
commit f2a9e16
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/test/component/test_component.py b/test/component/test_component.py
@@ -5,6 +5,7 @@
 
 import pika
 from coverage.python import os
+from google.api_core.exceptions import GoogleAPIError
 from google.cloud import pubsub_v1
 
 
@@ -67,8 +68,12 @@ def publish_to_pubsub(self, tx_id, case_id, questionnaire_id):
                                    eventType='OBJECT_FINALIZE',
                                    bucketId='123',
                                    objectId=tx_id)
-        while not future.done():
+        if not future.done():
             time.sleep(1)
+        try:
+            future.result(timeout=30)
+        except GoogleAPIError:
+            assert False, "Failed to publish message to pubsub"
 
         print(f'Message published to {topic_path}')
 

diff --git a/test/scripts/publish_message.py b/test/scripts/publish_message.py
@@ -3,6 +3,7 @@
 import time
 import uuid
 
+from google.api_core.exceptions import GoogleAPIError
 from google.cloud import pubsub_v1
 
 
@@ -29,8 +30,11 @@
                                eventType='OBJECT_FINALIZE',
                                bucketId='123',
                                objectId=tx_id)
-
-    while not future.done():
+    if not future.done():
         time.sleep(1)
+    try:
+        future.result(timeout=30)
+    except GoogleAPIError:
+        print("Failed to publish message to pubsub")
 
     print(f'Message published to {topic_path}')