diff options
Diffstat (limited to 'service/test')
| -rw-r--r-- | service/test/integration/test_drafts.py | 3 | ||||
| -rw-r--r-- | service/test/integration/test_soledad_querier.py | 90 | ||||
| -rw-r--r-- | service/test/perf/contacts/test_Contacts.py | 17 | ||||
| -rw-r--r-- | service/test/unit/adapter/mailstore/test_leap_mailstore.py | 1 |
4 files changed, 16 insertions, 95 deletions
diff --git a/service/test/integration/test_drafts.py b/service/test/integration/test_drafts.py index bc314c04..d0505d75 100644 --- a/service/test/integration/test_drafts.py +++ b/service/test/integration/test_drafts.py @@ -77,11 +77,8 @@ class DraftsTest(SoledadTestBase): @defer.inlineCallbacks def test_put_creates_a_draft_if_it_does_not_exist(self): mail = MailBuilder().with_subject('A new draft').build_json() - print '\nAdding mail\n' yield self.put_mail(mail)[0] - print '\nAdded mail\n' mails = yield self.get_mails_by_tag('drafts') - print '\ngot mails by tag\n' self.assertEquals('A new draft', mails[0].subject) diff --git a/service/test/integration/test_soledad_querier.py b/service/test/integration/test_soledad_querier.py deleted file mode 100644 index 5a24968b..00000000 --- a/service/test/integration/test_soledad_querier.py +++ /dev/null @@ -1,90 +0,0 @@ -# -# Copyright (c) 2014 ThoughtWorks, Inc. -# -# Pixelated is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Pixelated is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Pixelated. If not, see <http://www.gnu.org/licenses/>. - -import time -from unittest import skip - -from test.support.integration import SoledadTestBase, MailBuilder -from leap.mail.adaptors.soledad import MailboxWrapper -from twisted.internet import defer - - -@skip('No longer needed') -class SoledadQuerierTest(SoledadTestBase): - - def setUp(self): - self.maxDiff = None - return SoledadTestBase.setUp(self) - - def _get_empty_mailbox(self): - return MailboxWrapper() - - def _create_mailbox(self, mailbox_name): - new_mailbox = self._get_empty_mailbox() - new_mailbox.mbox = mailbox_name - new_mailbox.created = int(time.time() * 10E2) - return self.soledad.create_doc(new_mailbox.serialize()) - - @defer.inlineCallbacks - def _get_mailboxes_from_soledad(self, mailbox_name): - defer.returnValue([m for m in (yield self.soledad.get_from_index('by-type', 'mbox')) if m.content['mbox'] == mailbox_name]) - - @defer.inlineCallbacks - def test_remove_dup_mailboxes_keeps_the_one_with_the_highest_last_uid(self): - yield self.add_multiple_to_mailbox(3, 'INBOX') # by now we already have one inbox with 3 mails - duplicated_mbox = yield self._create_mailbox('INBOX') # now we have a duplicate - - # make sure we have two and duplicated is one of them - inboxes = yield self._get_mailboxes_from_soledad('INBOX') - self.assertEqual(2, len(inboxes)) - self.assertIn(duplicated_mbox, inboxes) - - yield self.soledad_querier.remove_duplicates() - - # make sure we only have one, and it is not the duplicated one - inboxes = yield self._get_mailboxes_from_soledad('INBOX') - self.assertEqual(1, len(inboxes)) - self.assertNotIn(duplicated_mbox, inboxes) - - @defer.inlineCallbacks - def test_all_mails_skips_incomplete_mails(self): - # creating incomplete mail, we will only save the fdoc - fdoc, hdoc, bdoc = MailBuilder().build_input_mail().get_for_save(1, 'INBOX') - yield self.soledad.create_doc(fdoc) - - mails = yield self.soledad_querier.all_mails() - self.assertEqual(0, len(mails)) # mail is incomplete since it only has fdoc - - # adding the hdoc still doesn't complete the mail - yield self.soledad.create_doc(hdoc) - - mails = yield self.soledad_querier.all_mails() - self.assertEqual(0, len(mails)) - - # now the mail is complete - yield self.soledad.create_doc(bdoc) - - mails = yield self.soledad_querier.all_mails() - self.assertEqual(1, len(mails)) - - @defer.inlineCallbacks - def test_get_mails_by_chash(self): - mails = yield self.add_multiple_to_mailbox(3, 'INBOX') - chashes = [mail.ident for mail in mails] - - fetched_mails = yield self.soledad_querier.mails(chashes) - - self.assertEquals([m.as_dict() for m in fetched_mails], [m.as_dict() for m in mails]) diff --git a/service/test/perf/contacts/test_Contacts.py b/service/test/perf/contacts/test_Contacts.py index 8bfb898d..967e9eb1 100644 --- a/service/test/perf/contacts/test_Contacts.py +++ b/service/test/perf/contacts/test_Contacts.py @@ -14,22 +14,37 @@ # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see <http://www.gnu.org/licenses/>. import unittest +import logging from funkload.FunkLoadTestCase import FunkLoadTestCase from test.support.integration import AppTestClient +from test.support.dispatcher.proxy import Proxy +from crochet import setup, wait_for +from leap.common.events.server import ensure_server +setup() + + +@wait_for(timeout=5.0) +def start_app_test_client(client): + ensure_server() + return client.start_client() class Contacts(FunkLoadTestCase): def setUpBench(self): + logging.disable('INFO') client = AppTestClient() + start_app_test_client(client) + client.listenTCP() + proxy = Proxy(proxy_port='8889', app_port='4567') # setup data client.add_multiple_to_mailbox(10, 'INBOX', to='to@inbox.com', cc='cc@inbox.com', bcc='bcc@inbox.com') client.add_multiple_to_mailbox(10, 'TRASH', to='to@trash.com', cc='cc@trash.com', bcc='bcc@trash.com') client.add_multiple_to_mailbox(10, 'DRAFTS', to='to@drafts.com', cc='cc@drafts.com', bcc='bcc@drafts.com') - self.call_to_terminate = client.run_on_a_thread(logfile='results/app.log') + self.call_to_terminate = proxy.run_on_a_thread() def tearDownBench(self): self.call_to_terminate() diff --git a/service/test/unit/adapter/mailstore/test_leap_mailstore.py b/service/test/unit/adapter/mailstore/test_leap_mailstore.py index a28731e3..c2ad2d5a 100644 --- a/service/test/unit/adapter/mailstore/test_leap_mailstore.py +++ b/service/test/unit/adapter/mailstore/test_leap_mailstore.py @@ -300,7 +300,6 @@ class TestLeapMailStore(TestCase): attachment = MIMEApplication('pretend to be binary attachment data') attachment.add_header('Content-Disposition', 'attachment', filename='filename.txt') input_mail.attach(attachment) - print input_mail.as_string() mocked_message = self._add_create_mail_mocks_to_soledad(input_mail) store = LeapMailStore(self.soledad) |