From c0b7c92b41eb7118a349cc91990d201d22816cad Mon Sep 17 00:00:00 2001 From: Duda Dornelles Date: Tue, 18 Nov 2014 11:52:09 -0200 Subject: Deferring TagsController.tags and fixing tests to deal with deferreds --- service/test/integration/delete_mail_test.py | 6 +- service/test/integration/drafts_test.py | 6 +- .../test/integration/mark_as_read_unread_test.py | 6 +- .../test/integration/retrieve_attachment_test.py | 6 +- service/test/integration/search_test.py | 70 +++++++++++++--------- service/test/integration/soledad_querier_test.py | 6 +- service/test/integration/tags_test.py | 6 +- 7 files changed, 60 insertions(+), 46 deletions(-) (limited to 'service/test/integration') diff --git a/service/test/integration/delete_mail_test.py b/service/test/integration/delete_mail_test.py index 10c09e7a..69ab1f03 100644 --- a/service/test/integration/delete_mail_test.py +++ b/service/test/integration/delete_mail_test.py @@ -18,13 +18,13 @@ import unittest from test.support.integration_helper import MailBuilder, SoledadTestBase -class DeleteMailTest(unittest.TestCase, SoledadTestBase): +class DeleteMailTest(SoledadTestBase): def setUp(self): - self.setup_soledad() + SoledadTestBase.setUp(self) def tearDown(self): - self.teardown_soledad() + SoledadTestBase.tearDown(self) def test_move_mail_to_trash_when_deleting(self): input_mail = MailBuilder().with_subject('Mail with tags').build_input_mail() diff --git a/service/test/integration/drafts_test.py b/service/test/integration/drafts_test.py index 5d2118df..41fda0df 100644 --- a/service/test/integration/drafts_test.py +++ b/service/test/integration/drafts_test.py @@ -18,13 +18,13 @@ import unittest from test.support.integration_helper import MailBuilder, SoledadTestBase -class DraftsTest(unittest.TestCase, SoledadTestBase): +class DraftsTest(SoledadTestBase): def setUp(self): - self.setup_soledad() + SoledadTestBase.setUp(self) def tearDown(self): - self.teardown_soledad() + SoledadTestBase.tearDown(self) def test_post_sends_mail_and_deletes_previous_draft_if_it_exists(self): # creates one draft diff --git a/service/test/integration/mark_as_read_unread_test.py b/service/test/integration/mark_as_read_unread_test.py index dc21c7b7..c04cdbc6 100644 --- a/service/test/integration/mark_as_read_unread_test.py +++ b/service/test/integration/mark_as_read_unread_test.py @@ -19,13 +19,13 @@ from test.support.integration_helper import MailBuilder, SoledadTestBase from pixelated.adapter.status import Status -class MarkAsReadUnreadTest(unittest.TestCase, SoledadTestBase): +class MarkAsReadUnreadTest(SoledadTestBase): def setUp(self): - self.setup_soledad() + SoledadTestBase.setUp(self) def tearDown(self): - self.teardown_soledad() + SoledadTestBase.tearDown(self) def test_mark_single_as_read(self): input_mail = MailBuilder().build_input_mail() diff --git a/service/test/integration/retrieve_attachment_test.py b/service/test/integration/retrieve_attachment_test.py index 37bc3ca2..4e0e76e0 100644 --- a/service/test/integration/retrieve_attachment_test.py +++ b/service/test/integration/retrieve_attachment_test.py @@ -18,13 +18,13 @@ import unittest from test.support.integration_helper import SoledadTestBase -class RetrieveAttachmentTest(unittest.TestCase, SoledadTestBase): +class RetrieveAttachmentTest(SoledadTestBase): def setUp(self): - self.setup_soledad() + SoledadTestBase.setUp(self) def tearDown(self): - self.teardown_soledad() + SoledadTestBase.tearDown(self) def test_attachment_content_is_retrieved(self): ident = 'F4E99C1CEC4D300A4223A96CCABBE0304BDBC31C550A5A03E207A5E4C3C71A22' diff --git a/service/test/integration/search_test.py b/service/test/integration/search_test.py index 649f7b96..95b510e6 100644 --- a/service/test/integration/search_test.py +++ b/service/test/integration/search_test.py @@ -13,66 +13,80 @@ # # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see . -import unittest +from nose.twistedtools import deferred from test.support.integration_helper import MailBuilder, SoledadTestBase -class SearchTest(unittest.TestCase, SoledadTestBase): +class SearchTest(SoledadTestBase): def setUp(self): - self.setup_soledad() - - def tearDown(self): - self.teardown_soledad() + SoledadTestBase.setUp(self) + @deferred(timeout=5) def test_that_tags_returns_all_tags(self): input_mail = MailBuilder().with_tags(['important']).build_input_mail() self.add_mail_to_inbox(input_mail) - all_tags = self.get_tags() + d = self.get_tags() - all_tag_names = [t['name'] for t in all_tags] - self.assertTrue('inbox' in all_tag_names) - self.assertTrue('sent' in all_tag_names) - self.assertTrue('trash' in all_tag_names) - self.assertTrue('drafts' in all_tag_names) - self.assertTrue('important' in all_tag_names) + def _assert(all_tags): + all_tag_names = [t['name'] for t in all_tags] + self.assertTrue('inbox' in all_tag_names) + self.assertTrue('sent' in all_tag_names) + self.assertTrue('trash' in all_tag_names) + self.assertTrue('drafts' in all_tag_names) + self.assertTrue('important' in all_tag_names) + d.addCallback(_assert) + return d + @deferred(timeout=5) def test_that_tags_are_filtered_by_query(self): input_mail = MailBuilder().with_tags(['ateu', 'catoa', 'luat', 'zuado']).build_input_mail() self.add_mail_to_inbox(input_mail) - all_tags = self.get_tags(q=["at"], skipDefaultTags=["true"]) + d = self.get_tags(q=["at"], skipDefaultTags=["true"]) + + def _assert(all_tags): + all_tag_names = [t['name'] for t in all_tags] + self.assertEqual(3, len(all_tag_names)) + self.assertTrue('ateu' in all_tag_names) + self.assertTrue('catoa' in all_tag_names) + self.assertTrue('luat' in all_tag_names) - all_tag_names = [t['name'] for t in all_tags] - self.assertEqual(3, len(all_tag_names)) - self.assertTrue('ateu' in all_tag_names) - self.assertTrue('catoa' in all_tag_names) - self.assertTrue('luat' in all_tag_names) + d.addCallback(_assert) + return d + @deferred(timeout=5) def test_that_default_tags_are_ignorable(self): input_mail = MailBuilder().with_tags(['sometag']).build_input_mail() self.add_mail_to_inbox(input_mail) - all_tags = self.get_tags(skipDefaultTags=["true"]) + d = self.get_tags(skipDefaultTags=["true"]) - all_tag_names = [t['name'] for t in all_tags] - self.assertEqual(1, len(all_tag_names)) - self.assertTrue('sometag' in all_tag_names) + def _assert(all_tags): + all_tag_names = [t['name'] for t in all_tags] + self.assertEqual(1, len(all_tag_names)) + self.assertTrue('sometag' in all_tag_names) + d.addCallback(_assert) + return d + @deferred(timeout=5) def test_tags_count(self): self.add_multiple_to_mailbox(num=10, mailbox='inbox', flags=['\\Recent']) self.add_multiple_to_mailbox(num=5, mailbox='inbox', flags=['\\Seen']) self.add_multiple_to_mailbox(num=3, mailbox='inbox', flags=['\\Recent'], tags=['important', 'later']) self.add_multiple_to_mailbox(num=1, mailbox='inbox', flags=['\\Seen'], tags=['important']) - tags_count = self.get_tags() + d = self.get_tags() - self.assertEqual(self.get_count(tags_count, 'inbox')['total'], 19) - self.assertEqual(self.get_count(tags_count, 'inbox')['read'], 6) - self.assertEqual(self.get_count(tags_count, 'important')['total'], 4) - self.assertEqual(self.get_count(tags_count, 'important')['read'], 1) + def _assert(tags_count): + self.assertEqual(self.get_count(tags_count, 'inbox')['total'], 19) + self.assertEqual(self.get_count(tags_count, 'inbox')['read'], 6) + self.assertEqual(self.get_count(tags_count, 'important')['total'], 4) + self.assertEqual(self.get_count(tags_count, 'important')['read'], 1) + d.addCallback(_assert) + return d def test_search_mails_different_window(self): input_mail = MailBuilder().build_input_mail() diff --git a/service/test/integration/soledad_querier_test.py b/service/test/integration/soledad_querier_test.py index 5d9bcccd..e8be431b 100644 --- a/service/test/integration/soledad_querier_test.py +++ b/service/test/integration/soledad_querier_test.py @@ -21,13 +21,13 @@ from test.support.integration_helper import SoledadTestBase, MailBuilder from leap.mail.imap.fields import WithMsgFields -class SoledadQuerierTest(unittest.TestCase, SoledadTestBase, WithMsgFields): +class SoledadQuerierTest(SoledadTestBase, WithMsgFields): def setUp(self): - self.setup_soledad() + SoledadTestBase.setUp(self) def tearDown(self): - self.teardown_soledad() + SoledadTestBase.tearDown(self) def _get_empty_mailbox(self): return copy.deepcopy(self.EMPTY_MBOX) diff --git a/service/test/integration/tags_test.py b/service/test/integration/tags_test.py index bd22e4b5..bb3bdbdb 100644 --- a/service/test/integration/tags_test.py +++ b/service/test/integration/tags_test.py @@ -19,13 +19,13 @@ import unittest from test.support.integration_helper import MailBuilder, SoledadTestBase -class TagsTest(unittest.TestCase, SoledadTestBase): +class TagsTest(SoledadTestBase): def setUp(self): - self.setup_soledad() + SoledadTestBase.setUp(self) def tearDown(self): - self.teardown_soledad() + SoledadTestBase.tearDown(self) def _tags_json(self, tags): return json.dumps({'newtags': tags}) -- cgit v1.2.3