adds permant deleted for trashed messages.

2 files changed, 11 insertions, 1 deletions

diff --git a/service/test/integration/delete_mail_test.py b/service/test/integration/delete_mail_test.py
index 894f84bf..10c09e7a 100644
--- a/service/test/integration/delete_mail_test.py
+++ b/service/test/integration/delete_mail_test.py
@@ -39,3 +39,11 @@ class DeleteMailTest(unittest.TestCase, SoledadTestBase):
         self.assertEquals(0, len(inbox_mails))
         trash_mails = self.get_mails_by_tag('trash')
         self.assertEquals(1, len(trash_mails))
+
+    def test_delete_mail_when_trashing_mail_from_trash_mailbox(self):
+        mails = self.add_multiple_to_mailbox(1, 'trash')
+        self.delete_mail(mails[0].ident)
+
+        trash_mails = self.get_mails_by_tag('trash')
+
+        self.assertEqual(0, len(trash_mails))
diff --git a/service/test/support/integration_helper.py b/service/test/support/integration_helper.py
index 3667001f..e71da443 100644
--- a/service/test/support/integration_helper.py
+++ b/service/test/support/integration_helper.py
@@ -220,12 +220,14 @@ class SoledadTestBase:
         self.search_engine.index_mail(mail)
 
     def add_multiple_to_mailbox(self, num, mailbox='', flags=[], tags=[]):
+        mails = []
         for _ in range(num):
             input_mail = MailBuilder().with_status(flags).with_tags(tags).build_input_mail()
             mail = self.mailboxes._create_or_get(mailbox).add(input_mail)
+            mails.append(mail)
             mail.update_tags(input_mail.tags)
             self.search_engine.index_mail(mail)
-
+        return mails
 
 class ResponseMail:
     def __init__(self, mail_dict):