From c51c1024299fcf69cc67388b7dc35760a0414d12 Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Thu, 28 Aug 2014 16:32:21 -0300 Subject: fix - account.mailboxes is a list of strings, using getMailbox to get from the name --- service/pixelated/adapter/mail_service.py | 4 ++-- service/test/adapter/mail_service_test.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/service/pixelated/adapter/mail_service.py b/service/pixelated/adapter/mail_service.py index f5bfd1c8..5a60d1bb 100644 --- a/service/pixelated/adapter/mail_service.py +++ b/service/pixelated/adapter/mail_service.py @@ -57,8 +57,8 @@ class MailService: mails = [] if query['tags']: tags = [Tag(tag) for tag in query['tags']] - for leap_mailbox in self.account.mailboxes: - mailbox = PixelatedMailbox(leap_mailbox) + for leap_mailbox_name in self.account.mailboxes: + mailbox = PixelatedMailbox(self.account.getMailbox(leap_mailbox_name)) if len(mailbox.all_tags().intersection(tags)): # mailbox has at least one mail with tag for mail in mailbox.mails(): diff --git a/service/test/adapter/mail_service_test.py b/service/test/adapter/mail_service_test.py index b351df1c..d736e0d0 100644 --- a/service/test/adapter/mail_service_test.py +++ b/service/test/adapter/mail_service_test.py @@ -65,7 +65,8 @@ class TestMailService(unittest.TestCase): mailbox.messages = [matching_mail, not_matching_mail] mailbox.all_tags.return_value = set() account = MagicMock() - account.mailboxes = [mailbox] + account.mailboxes = ['inbox'] + account.getMailbox.return_value = mailbox leap_session = MagicMock(account=account) -- cgit v1.2.3