Merge branch 'develop' into feature/issue-782-temporary-config-solution

go/apps/subscription/definition.py

@@ -10,7 +10,7 @@ def get_metrics(self):
 
         campaign_names = sorted(set([
             h['campaign_name']
-            for h in self.conv.get_config().get('handlers', [])]))
+            for h in self.conv.config.get('handlers', [])]))
 
         metrics.extend([
             SubscribedMetric(self.conv, campaign_name)

go/apps/subscription/tests/test_definition.py

@@ -9,13 +9,14 @@ def setUp(self):
         super(TestSubscriptionConversationDefinition, self).setUp()
 
         self.setup_user_api()
-        self.conv = self.create_conversation(
+        wrapped_conv = self.create_conversation(
             conversation_type=u'subscription',
             config={
                 'handlers': [
                     {'campaign_name': 'campaign-1'},
                     {'campaign_name': 'campaign-2'}]
             })
+        self.conv = wrapped_conv.c
         self.conv_def = ConversationDefinition(self.conv)
 
     def test_metrics_retrieval(self):

go/conversation/view_definition.py

@@ -294,7 +294,7 @@ def send_one_off_reply(user_api, conversation, in_reply_to, content):
                 "to_addr": inbound_message['from_addr'],
                 "content": content,
                 "msg_options": {'in_reply_to': in_reply_to},
-           }
+            }
         )
 
     def post(self, request, conversation):

go/vumitools/tests/test_metrics_worker.py

@@ -106,6 +106,11 @@ def test_send_metrics_command(self):
 
     @inlineCallbacks
     def test_metrics_loop_func(self):
+        def no_looping(*args, **kw):
+            return self.looping_call(lambda: None)
+        self.patch(metrics_worker, 'LoopingCall',
+                   no_looping)
+
         worker = yield self.get_metrics_worker()
         acc1 = yield self.make_account(worker, u'acc1')
         acc2 = yield self.make_account(worker, u'acc2')