jerith

(topaz)lantea:topaz jerith$ bin/fab specs.run
[localhost] local: ../mspec/bin/mspec run -G fails  -t `pwd`/bin/topaz --config=topaz.mspec 
topaz (ruby-1.9.3p125) [i386-darwin]
.........................................................................................................................................................................................................................................................................................................................................................................................................................................................................E......................................................................................................................................................................................................................................................................................................................................................................................................

jerith

diff --git a/vumi/components/message_store.py b/vumi/components/message_store.py
index a30136f..6fdc96e 100644
--- a/vumi/components/message_store.py
+++ b/vumi/components/message_store.py
@@ -250,11 +250,12 @@ class MessageStore(object):
     def get_batch(self, batch_id):
         return self.batches.load(batch_id)
 
+    @Manager.calls_manager
     def get_tag_info(self, tag):

jerith

diff --git a/go/base/static/css/.DS_Store b/go/base/static/css/.DS_Store
deleted file mode 100644
index 3970b47..0000000
Binary files a/go/base/static/css/.DS_Store and /dev/null differ
diff --git a/go/base/static/css/smoothness/.DS_Store b/go/base/static/css/smoothness/.DS_Store
deleted file mode 100644
index ca7af8d..0000000
Binary files a/go/base/static/css/smoothness/.DS_Store and /dev/null differ
diff --git a/go/base/static/old/css/.DS_Store b/go/base/static/old/css/.DS_Store
deleted file mode 100644

jerith

diff --git a/go/apps/sequential_send/views.py b/go/apps/sequential_send/views.py
index b11da0b..f694575 100644
--- a/go/apps/sequential_send/views.py
+++ b/go/apps/sequential_send/views.py
@@ -91,7 +91,10 @@ class UsedTagConversationForm(VumiModelForm):
     def clean_delivery_class(self):
         for conv in self.conversations:
             if conv.key == self.cleaned_data['delivery_class']:
-                return conv.delivery_class
+                delivery_class = conv.delivery_class

jerith

diff --git a/vumi/persist/riak_manager.py b/vumi/persist/riak_manager.py
index 466f830..559087f 100644
--- a/vumi/persist/riak_manager.py
+++ b/vumi/persist/riak_manager.py
@@ -2,6 +2,8 @@
 
 """A manager implementation on top of the riak Python package."""
 
+import json
+

jerith

diff --git a/vumi/persist/riak_manager.py b/vumi/persist/riak_manager.py
index 466f830..8a09317 100644
--- a/vumi/persist/riak_manager.py
+++ b/vumi/persist/riak_manager.py
@@ -2,6 +2,8 @@
 
 """A manager implementation on top of the riak Python package."""
 
+import json
+

jerith

diff --git a/go/apps/bulk_message/tests/test_vumi_app.py b/go/apps/bulk_message/tests/test_vum
index 6a071cd..1f728c3 100644
--- a/go/apps/bulk_message/tests/test_vumi_app.py
+++ b/go/apps/bulk_message/tests/test_vumi_app.py
@@ -214,6 +214,37 @@ class TestBulkMessageApplication(AppWorkerTestCase):
         self.assertEqual(sent_msg['in_reply_to'], msg['message_id'])
 
     @inlineCallbacks
+    def test_process_command_send_message_in_reply_to_bad_transport_name(self):
+        msg = self.mkmsg_in(message_id=uuid.uuid4().hex, transport_name="bad")

jerith

diff --git a/vumi/message.py b/vumi/message.py
index 1235353..0f9a461 100644
--- a/vumi/message.py
+++ b/vumi/message.py
@@ -229,8 +229,13 @@ class TransportUserMessage(TransportMessage):
         :meth:`reply` suitable for constructing both one-to-one messages (such
         as SMS) and directed messages within a group chat (such as
         name-prefixed content in an IRC channel message).
+
+        FIXME: `helper_metadata` should *not* be copied to the reply message.

jerith

diff --git a/vumi/message.py b/vumi/message.py
index 1235353..746b050 100644
--- a/vumi/message.py
+++ b/vumi/message.py
@@ -229,20 +229,46 @@ class TransportUserMessage(TransportMessage):
         :meth:`reply` suitable for constructing both one-to-one messages (such
         as SMS) and directed messages within a group chat (such as
         name-prefixed content in an IRC channel message).
+
+        FIXME: `helper_metadata` should *not* be copied to the reply message.

jerith

diff --git a/campaigns/campaigns/guinness_ng_2012_11.py b/campaigns/campaigns/guinness_ng_2012_11.py
index 0d39d22..e9ddcdc 100644
--- a/campaigns/campaigns/guinness_ng_2012_11.py
+++ b/campaigns/campaigns/guinness_ng_2012_11.py
@@ -143,20 +143,21 @@ class GuinnessNigeriaCampaignHandler(CampaignHandler):
         CampaignEntryMessages = datastore.campaign_entry_messages
         statuses = CampaignEntryMessages.count_messages_by_status(txn)
         for status in ['valid', 'invalid', 'used']:
-            metric_name = 'entry_messages.status.%s' % (status,)
             value = statuses.get(status, 0)