From 7ce94ca43a816803613339ed39f821a9a5e1da1e Mon Sep 17 00:00:00 2001 From: justinvdm Date: Wed, 20 Nov 2013 15:45:55 +0200 Subject: [PATCH 1/3] Fix bad indentation (thanks @jerith) --- go/conversation/view_definition.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/conversation/view_definition.py b/go/conversation/view_definition.py index 02879617c..0693b062a 100644 --- a/go/conversation/view_definition.py +++ b/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): From 6f2dda5c40ef2a037e64c62b0d862865ddf1e110 Mon Sep 17 00:00:00 2001 From: Simon Cross Date: Thu, 21 Nov 2013 10:21:33 +0200 Subject: [PATCH 2/3] Fix race condition in metrics worker looping function test (the looping call could fire before the explicit call to the looping function, cause two sets of command messages to be sent). (@jerith). --- go/vumitools/tests/test_metrics_worker.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/go/vumitools/tests/test_metrics_worker.py b/go/vumitools/tests/test_metrics_worker.py index 5a2ea0188..203d562f4 100644 --- a/go/vumitools/tests/test_metrics_worker.py +++ b/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') From eb546514bf06a50f361f58f7c25e159d7999dc9b Mon Sep 17 00:00:00 2001 From: Simon Cross Date: Thu, 21 Nov 2013 10:27:46 +0200 Subject: [PATCH 3/3] Fix accessing of conversation config in subscription metrics generation (@jerith). --- go/apps/subscription/definition.py | 2 +- go/apps/subscription/tests/test_definition.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/go/apps/subscription/definition.py b/go/apps/subscription/definition.py index aae839686..2318ea123 100644 --- a/go/apps/subscription/definition.py +++ b/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) diff --git a/go/apps/subscription/tests/test_definition.py b/go/apps/subscription/tests/test_definition.py index 85e2bdfc2..4e48771bd 100644 --- a/go/apps/subscription/tests/test_definition.py +++ b/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):