fixing integration.test_tags

1 files changed, 29 insertions, 22 deletions

diff --git a/service/test/integration/test_tags.py b/service/test/integration/test_tags.py
index 168e035f..75cb81f6 100644
--- a/service/test/integration/test_tags.py
+++ b/service/test/integration/test_tags.py
@@ -15,6 +15,8 @@
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 import json
 
+from twisted.internet import defer
+
 from test.support.integration import SoledadTestBase, MailBuilder
 from pixelated.adapter.services.tag_service import SPECIAL_TAGS
 
@@ -24,67 +26,72 @@ class TagsTest(SoledadTestBase):
     def _tags_json(self, tags):
         return json.dumps({'newtags': tags})
 
+    @defer.inlineCallbacks
     def test_add_tag_to_an_inbox_mail_and_query(self):
         mail = MailBuilder().with_subject('Mail with tags').build_input_mail()
-        self.add_mail_to_inbox(mail)
+        yield self.add_mail_to_inbox(mail)
 
-        self.post_tags(mail.ident, self._tags_json(['IMPORTANT']))
+        yield self.post_tags(mail.ident, self._tags_json(['IMPORTANT']))
 
-        mails = self.get_mails_by_tag('inbox')
+        mails = yield self.get_mails_by_tag('inbox')
         self.assertEquals({'IMPORTANT'}, set(mails[0].tags))
 
-        mails = self.get_mails_by_tag('IMPORTANT')
+        mails = yield self.get_mails_by_tag('IMPORTANT')
         self.assertEquals('Mail with tags', mails[0].subject)
 
+    @defer.inlineCallbacks
     def test_use_old_casing_when_same_tag_with_different_casing_is_posted(self):
         mail = MailBuilder().with_subject('Mail with tags').build_input_mail()
-        self.add_mail_to_inbox(mail)
-        self.post_tags(mail.ident, self._tags_json(['ImPoRtAnT']))
-        mails = self.get_mails_by_tag('ImPoRtAnT')
+        yield self.add_mail_to_inbox(mail)
+        yield self.post_tags(mail.ident, self._tags_json(['ImPoRtAnT']))
+        mails = yield self.get_mails_by_tag('ImPoRtAnT')
         self.assertEquals({'ImPoRtAnT'}, set(mails[0].tags))
 
         another_mail = MailBuilder().with_subject('Mail with tags').build_input_mail()
-        self.add_mail_to_inbox(another_mail)
-        self.post_tags(another_mail.ident, self._tags_json(['IMPORTANT']))
-        mails = self.get_mails_by_tag('IMPORTANT')
+        yield self.add_mail_to_inbox(another_mail)
+        yield self.post_tags(another_mail.ident, self._tags_json(['IMPORTANT']))
+        mails = yield self.get_mails_by_tag('IMPORTANT')
         self.assertEquals(0, len(mails))
-        mails = self.get_mails_by_tag('ImPoRtAnT')
+        mails = yield self.get_mails_by_tag('ImPoRtAnT')
         self.assertEquals(2, len(mails))
         self.assertEquals({'ImPoRtAnT'}, set(mails[0].tags))
         self.assertEquals({'ImPoRtAnT'}, set(mails[1].tags))
 
+    @defer.inlineCallbacks
     def test_tags_are_case_sensitive(self):
         mail = MailBuilder().with_subject('Mail with tags').build_input_mail()
-        self.add_mail_to_inbox(mail)
+        yield self.add_mail_to_inbox(mail)
 
-        self.post_tags(mail.ident, self._tags_json(['ImPoRtAnT']))
+        yield self.post_tags(mail.ident, self._tags_json(['ImPoRtAnT']))
 
-        mails = self.get_mails_by_tag('important')
+        mails = yield self.get_mails_by_tag('important')
         self.assertEquals(0, len(mails))
 
-        mails = self.get_mails_by_tag('IMPORTANT')
+        mails = yield self.get_mails_by_tag('IMPORTANT')
         self.assertEquals(0, len(mails))
 
-        mails = self.get_mails_by_tag('ImPoRtAnT')
+        mails = yield self.get_mails_by_tag('ImPoRtAnT')
         self.assertEquals({'ImPoRtAnT'}, set(mails[0].tags))
 
+    @defer.inlineCallbacks
     def test_empty_tags_are_not_allowed(self):
         mail = MailBuilder().with_subject('Mail with tags').build_input_mail()
-        self.add_mail_to_inbox(mail)
+        yield self.add_mail_to_inbox(mail)
 
-        self.post_tags(mail.ident, self._tags_json(['tag1', '   ']))
+        yield self.post_tags(mail.ident, self._tags_json(['tag1', '   ']))
 
-        mail = self.get_mail(mail.ident)
+        mail = yield self.get_mail(mail.ident)
 
         self.assertEquals(mail['tags'], ['tag1'])
 
+    @defer.inlineCallbacks
     def test_addition_of_reserved_tags_is_not_allowed(self):
         mail = MailBuilder().with_subject('Mail with tags').build_input_mail()
-        self.add_mail_to_inbox(mail)
+        yield self.add_mail_to_inbox(mail)
 
         for tag in SPECIAL_TAGS:
-            response = self.post_tags(mail.ident, self._tags_json([tag.name.upper()]))
+            response = yield self.post_tags(mail.ident, self._tags_json([tag.name.upper()]))
             self.assertEquals("None of the following words can be used as tags: %s" % tag.name, response)
 
-        mail = self.mailboxes.inbox.mail(mail.ident)
+        mail = yield (yield self.mailboxes.inbox).mail(mail.ident)
         self.assertNotIn('drafts', mail.tags)