Added delete mail to mail store.

- Fix for empty mails returned by leap_mail.

2 files changed, 27 insertions, 10 deletions

diff --git a/service/test/integration/test_leap_mailstore.py b/service/test/integration/test_leap_mailstore.py
index dbe0ffb0..a71df74d 100644
--- a/service/test/integration/test_leap_mailstore.py
+++ b/service/test/integration/test_leap_mailstore.py
@@ -54,13 +54,19 @@ class LeapMailStoreTest(SoledadTestBase):
         self.assertEqual('Itaque consequatur repellendus provident sunt quia.', mails[0].subject)
 
     @defer.inlineCallbacks
-    def test_add_mail(self):
+    def test_add_and_remove_mail(self):
         yield self.adaptor.initialize_store(self.soledad)
         mail = _load_mail_from_file('mbox00000000')
-        mailbox = yield self.store.add_mailbox('INBOX')
+        yield self.store.add_mailbox('INBOX')
 
         msg = yield self.store.add_mail('INBOX', mail.as_string())
 
+        yield self.store.delete_mail(msg.mail_id)
+
+        deleted_msg = yield self.store.get_mail(msg.mail_id)
+
+        self.assertIsNone(deleted_msg)
+
     @defer.inlineCallbacks
     def _create_mail_in_soledad(self, mail):
         message = self._convert_mail_to_leap_message(mail)
diff --git a/service/test/unit/adapter/mailstore/test_leap_mailstore.py b/service/test/unit/adapter/mailstore/test_leap_mailstore.py
index 154bc3e0..3a862da7 100644
--- a/service/test/unit/adapter/mailstore/test_leap_mailstore.py
+++ b/service/test/unit/adapter/mailstore/test_leap_mailstore.py
@@ -195,17 +195,28 @@ class TestLeapMailStore(TestCase):
 
         message = yield store.add_mail('INBOX', mail.as_string())
 
+        self.assertIsInstance(message, LeapMail)
         self._assert_message_docs_created(expected_message, message)
 
+    @defer.inlineCallbacks
+    def test_delete_mail(self):
+        mdoc_id, fdoc_id = self._add_mail_fixture_to_soledad('mbox00000000')
+
+        store = LeapMailStore(self.soledad)
+
+        yield store.delete_mail(mdoc_id)
+
+        verify(self.soledad).delete_doc(self.doc_by_id[mdoc_id])
+        verify(self.soledad).delete_doc(self.doc_by_id[fdoc_id])
+
     def _assert_message_docs_created(self, expected_message, actual_message):
-        expected_wrapper = expected_message.get_wrapper()
-        actual_wrapper = actual_message.get_wrapper()
-
-        verify(self.soledad).create_doc(expected_wrapper.mdoc.serialize(), doc_id=actual_wrapper.mdoc.doc_id)
-        verify(self.soledad).create_doc(expected_wrapper.fdoc.serialize(), doc_id=actual_wrapper.fdoc.doc_id)
-        verify(self.soledad).create_doc(expected_wrapper.hdoc.serialize(), doc_id=actual_wrapper.hdoc.doc_id)
-        for nr, cdoc in expected_wrapper.cdocs.items():
-            verify(self.soledad).create_doc(cdoc.serialize(), doc_id=actual_wrapper.cdocs[nr].doc_id)
+        wrapper = expected_message.get_wrapper()
+
+        verify(self.soledad).create_doc(wrapper.mdoc.serialize(), doc_id=actual_message.mail_id)
+        verify(self.soledad).create_doc(wrapper.fdoc.serialize(), doc_id=wrapper.fdoc.future_doc_id)
+        verify(self.soledad).create_doc(wrapper.hdoc.serialize(), doc_id=wrapper.hdoc.future_doc_id)
+        for nr, cdoc in wrapper.cdocs.items():
+            verify(self.soledad).create_doc(cdoc.serialize(), doc_id=wrapper.cdocs[nr].future_doc_id)
 
     def _mock_get_mailbox(self, mailbox_name):
         when(self.soledad).list_indexes().thenReturn(defer.succeed(MAIL_INDEXES)).thenReturn(