summaryrefslogtreecommitdiff
path: root/service/test/integration/test_soledad_querier.py
diff options
context:
space:
mode:
authorVictor Shyba <victor.shyba@gmail.com>2015-03-18 16:58:54 -0300
committerVictor Shyba <victor.shyba@gmail.com>2015-03-18 16:59:33 -0300
commitbdba0f2fce00d53d445371be3c09cda01274d0e8 (patch)
tree3b1152f31bbab0274901fccc0372283300deab24 /service/test/integration/test_soledad_querier.py
parent0dbd662b5bdc372f2148f72c86412e0555eac1dc (diff)
no more self.client, since those methods are available from test case base
Diffstat (limited to 'service/test/integration/test_soledad_querier.py')
-rw-r--r--service/test/integration/test_soledad_querier.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/service/test/integration/test_soledad_querier.py b/service/test/integration/test_soledad_querier.py
index 00967d85..0d3cee41 100644
--- a/service/test/integration/test_soledad_querier.py
+++ b/service/test/integration/test_soledad_querier.py
@@ -25,9 +25,7 @@ class SoledadQuerierTest(SoledadTestBase, WithMsgFields):
def setUp(self):
SoledadTestBase.setUp(self)
- self.soledad = self.client.soledad
self.maxDiff = None
- self.soledad_querier = self.client.soledad_querier
def _get_empty_mailbox(self):
return copy.deepcopy(self.EMPTY_MBOX)
@@ -42,7 +40,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.client.add_multiple_to_mailbox(3, 'INBOX') # by now we already have one inbox with 3 mails
+ self.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 +75,7 @@ class SoledadQuerierTest(SoledadTestBase, WithMsgFields):
self.assertEqual(1, len(mails))
def test_get_mails_by_chash(self):
- mails = self.client.add_multiple_to_mailbox(3, 'INBOX')
+ mails = self.add_multiple_to_mailbox(3, 'INBOX')
chashes = [mail.ident for mail in mails]
fetched_mails = self.soledad_querier.mails(chashes)
@@ -85,7 +83,7 @@ class SoledadQuerierTest(SoledadTestBase, WithMsgFields):
self.assertEquals([m.as_dict() for m in fetched_mails], [m.as_dict() for m in mails])
def test_empty_or_bad_queries_are_handled(self):
- self.client.add_multiple_to_mailbox(3, 'INBOX')
+ self.add_multiple_to_mailbox(3, 'INBOX')
test_parameters = ['', 'undefined', None, 'none']