From a7e4c6238e29962653d2c53ad2887eab6e98b420 Mon Sep 17 00:00:00 2001 From: Duda Dornelles Date: Wed, 19 Nov 2014 12:06:05 -0200 Subject: better organization for integration test support classes --- service/test/integration/soledad_querier_test.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'service/test/integration/soledad_querier_test.py') diff --git a/service/test/integration/soledad_querier_test.py b/service/test/integration/soledad_querier_test.py index e8be431b..4a99a620 100644 --- a/service/test/integration/soledad_querier_test.py +++ b/service/test/integration/soledad_querier_test.py @@ -15,9 +15,9 @@ # along with Pixelated. If not, see . import copy -import unittest import time -from test.support.integration_helper import SoledadTestBase, MailBuilder + +from test.support.integration import * from leap.mail.imap.fields import WithMsgFields @@ -25,6 +25,8 @@ class SoledadQuerierTest(SoledadTestBase, WithMsgFields): def setUp(self): SoledadTestBase.setUp(self) + self.soledad = self.client.soledad + self.soledad_querier = self.client.soledad_querier def tearDown(self): SoledadTestBase.tearDown(self) @@ -42,7 +44,7 @@ class SoledadQuerierTest(SoledadTestBase, WithMsgFields): return [m for m in self.soledad.get_from_index('by-type', 'mbox') if m.content['mbox'] == mailbox_name] def test_remove_dup_mailboxes_keeps_the_one_with_the_highest_last_uid(self): - self.add_multiple_to_mailbox(3, 'INBOX') # by now we already have one inbox with 3 mails + self.client.add_multiple_to_mailbox(3, 'INBOX') # by now we already have one inbox with 3 mails self._create_mailbox('INBOX') # now we have a duplicate # make sure we have two @@ -77,7 +79,7 @@ class SoledadQuerierTest(SoledadTestBase, WithMsgFields): self.assertEqual(1, len(mails)) def test_get_mails_by_chash(self): - mails = self.add_multiple_to_mailbox(3, 'INBOX') + mails = self.client.add_multiple_to_mailbox(3, 'INBOX') chashes = [mail.ident for mail in mails] fetched_mails = self.soledad_querier.mails(chashes) -- cgit v1.2.3