diff options
| author | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-07-22 09:37:24 +0000 |
|---|---|---|
| committer | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-08-11 17:00:27 +0200 |
| commit | 414f210a908427da10a90fb4c8c83d58e1496b26 (patch) | |
| tree | 45b6eb2e12a15232f732993658cbe9276cd4b4cc /service/pixelated/adapter/services/mail_service.py | |
| parent | cb0c0b7905be251191e9ef78908d84ed617283c8 (diff) | |
Fixed test_delete_mail integration test.
Diffstat (limited to 'service/pixelated/adapter/services/mail_service.py')
| -rw-r--r-- | service/pixelated/adapter/services/mail_service.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/service/pixelated/adapter/services/mail_service.py b/service/pixelated/adapter/services/mail_service.py index b66d7345..da1b1bea 100644 --- a/service/pixelated/adapter/services/mail_service.py +++ b/service/pixelated/adapter/services/mail_service.py @@ -100,19 +100,21 @@ class MailService(object): yield mail.mark_as_unread() self.search_engine.index_mail(mail) + @defer.inlineCallbacks def delete_mail(self, mail_id): - mail = self.mail(mail_id) + mail = yield self.mail(mail_id) if mail.mailbox_name == 'TRASH': - self.delete_permanent(mail_id) + yield self.delete_permanent(mail_id) else: - trashed_mail = self.mailboxes.move_to_trash(mail_id) + trashed_mail = yield self.mailboxes.move_to_trash(mail_id) self.search_engine.index_mail(trashed_mail) def recover_mail(self, mail_id): recovered_mail = self.mailboxes.move_to_inbox(mail_id) self.search_engine.index_mail(recovered_mail) + @defer.inlineCallbacks def delete_permanent(self, mail_id): - mail = self.mail(mail_id) + mail = yield self.mail(mail_id) self.search_engine.remove_from_index(mail_id) - self.querier.remove_mail(mail) + yield self.querier.remove_mail(mail) |