Merge djmitche/build-relengapi:issue178 (PR #178)

relengapi/lib/aws.py

@@ -138,6 +138,8 @@ def _spawn_sqs_listeners(self, _testing=False):
             while True:
                 time.sleep(2 ** 31)
 
+        return threads
+
 
 def init_app(app):
     app.aws = AWS(app.config.get('AWS', {}))

relengapi/tests/test_lib_aws.py

@@ -135,17 +135,22 @@ def listener(msg):
             if body == 'BODY2':
                 raise aws._StopListening
 
-        app.aws._spawn_sqs_listeners(_testing=True)
-        app.aws.sqs_write('us-east-1', 'my-sqs-queue', 'BODY1')
-        app.aws.sqs_write('us-east-1', 'my-sqs-queue', 'EXC')
-        app.aws.sqs_write('us-east-1', 'my-sqs-queue', 'BODY2')
-
-        eq_(got_msgs.get(), 'BODY1')
-        eq_(got_msgs.get(), 'BODY2')
-
-        # check that the exception was logged
-        assert any(
-            'while invoking' in record.message for record in log_buffer.buffer)
+        threads = app.aws._spawn_sqs_listeners(_testing=True)
+        try:
+            app.aws.sqs_write('us-east-1', 'my-sqs-queue', 'BODY1')
+            app.aws.sqs_write('us-east-1', 'my-sqs-queue', 'EXC')
+            app.aws.sqs_write('us-east-1', 'my-sqs-queue', 'BODY2')
+
+            eq_(got_msgs.get(), 'BODY1')
+            eq_(got_msgs.get(), 'BODY2')
+
+            # check that the exception was logged
+            assert any(
+                'while invoking' in record.message for record in log_buffer.buffer)
+
+        finally:
+            for th in threads:
+                th.join()
 
         # NOTE: moto does not support changing message visibility, so there's no
         # good way to programmatically verify that messages are being deleted