From db7f2cc07eba1ac2275495c3eb045d5610b776d3 Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Wed, 18 Mar 2015 17:17:35 -0300 Subject: cleaning import * from integration and unit tests --- service/test/integration/test_delete_mail.py | 2 +- service/test/integration/test_drafts.py | 4 ++-- service/test/integration/test_mark_as_read_unread.py | 2 +- service/test/integration/test_search.py | 2 +- service/test/integration/test_soledad_querier.py | 2 +- service/test/integration/test_tags.py | 2 +- service/test/unit/adapter/search/test_search.py | 2 +- service/test/unit/adapter/test_draft_service.py | 2 +- service/test/unit/adapter/test_mail.py | 2 +- service/test/unit/adapter/test_mail_service.py | 4 +--- service/test/unit/adapter/test_mailbox.py | 2 +- service/test/unit/adapter/test_mailbox_indexer_listener.py | 2 +- service/test/unit/resources/test_sync_info_controller.py | 2 +- 13 files changed, 14 insertions(+), 16 deletions(-) (limited to 'service/test') diff --git a/service/test/integration/test_delete_mail.py b/service/test/integration/test_delete_mail.py index 8a7026f5..987cf307 100644 --- a/service/test/integration/test_delete_mail.py +++ b/service/test/integration/test_delete_mail.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see . -from test.support.integration import * +from test.support.integration import SoledadTestBase, MailBuilder class DeleteMailTest(SoledadTestBase): diff --git a/service/test/integration/test_drafts.py b/service/test/integration/test_drafts.py index cf96e0d9..3a0f120b 100644 --- a/service/test/integration/test_drafts.py +++ b/service/test/integration/test_drafts.py @@ -14,8 +14,8 @@ # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see . -from test.support.integration import * -from mockito import * +from test.support.integration import SoledadTestBase, MailBuilder +from mockito import unstub, when, any from twisted.internet.defer import Deferred diff --git a/service/test/integration/test_mark_as_read_unread.py b/service/test/integration/test_mark_as_read_unread.py index f2f863a7..6119f121 100644 --- a/service/test/integration/test_mark_as_read_unread.py +++ b/service/test/integration/test_mark_as_read_unread.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see . -from test.support.integration import * +from test.support.integration import SoledadTestBase, MailBuilder from pixelated.adapter.model.status import Status diff --git a/service/test/integration/test_search.py b/service/test/integration/test_search.py index 9062bf67..f90ed80f 100644 --- a/service/test/integration/test_search.py +++ b/service/test/integration/test_search.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see . -from test.support.integration import * +from test.support.integration import SoledadTestBase, MailBuilder class SearchTest(SoledadTestBase): diff --git a/service/test/integration/test_soledad_querier.py b/service/test/integration/test_soledad_querier.py index 0d3cee41..f5b2978f 100644 --- a/service/test/integration/test_soledad_querier.py +++ b/service/test/integration/test_soledad_querier.py @@ -17,7 +17,7 @@ import copy import time -from test.support.integration import * +from test.support.integration import SoledadTestBase, MailBuilder from leap.mail.imap.fields import WithMsgFields diff --git a/service/test/integration/test_tags.py b/service/test/integration/test_tags.py index aa20e88b..976b6d96 100644 --- a/service/test/integration/test_tags.py +++ b/service/test/integration/test_tags.py @@ -15,7 +15,7 @@ # along with Pixelated. If not, see . import json -from test.support.integration import * +from test.support.integration import SoledadTestBase, MailBuilder from pixelated.adapter.services.tag_service import SPECIAL_TAGS diff --git a/service/test/unit/adapter/search/test_search.py b/service/test/unit/adapter/search/test_search.py index 9018d7c5..a3726b88 100644 --- a/service/test/unit/adapter/search/test_search.py +++ b/service/test/unit/adapter/search/test_search.py @@ -16,7 +16,7 @@ import unittest -from mockito import * +from mockito import mock, when from pixelated.adapter.search import SearchEngine from tempdir import TempDir from test.support import test_helper diff --git a/service/test/unit/adapter/test_draft_service.py b/service/test/unit/adapter/test_draft_service.py index baa07ce0..0dd6cd2a 100644 --- a/service/test/unit/adapter/test_draft_service.py +++ b/service/test/unit/adapter/test_draft_service.py @@ -3,7 +3,7 @@ import unittest from pixelated.adapter.model.mail import InputMail from pixelated.adapter.services.draft_service import DraftService import test.support.test_helper as test_helper -from mockito import * +from mockito import mock, verify, inorder, when class DraftServiceTest(unittest.TestCase): diff --git a/service/test/unit/adapter/test_mail.py b/service/test/unit/adapter/test_mail.py index 5bb46687..87fbecc1 100644 --- a/service/test/unit/adapter/test_mail.py +++ b/service/test/unit/adapter/test_mail.py @@ -17,7 +17,7 @@ import unittest import pixelated.support.date from pixelated.adapter.model.mail import PixelatedMail, InputMail -from mockito import * +from mockito import mock, unstub, when from test.support import test_helper import dateutil.parser as dateparser import base64 diff --git a/service/test/unit/adapter/test_mail_service.py b/service/test/unit/adapter/test_mail_service.py index f815268c..34fec708 100644 --- a/service/test/unit/adapter/test_mail_service.py +++ b/service/test/unit/adapter/test_mail_service.py @@ -18,11 +18,9 @@ from pixelated.adapter.model.mail import InputMail, PixelatedMail from pixelated.adapter.services.mail_service import MailService from test.support.test_helper import mail_dict, leap_mail -from mockito import * +from mockito import mock, unstub, when, verify, verifyNoMoreInteractions, any from twisted.internet.defer import Deferred -from twisted.internet import defer - class TestMailService(unittest.TestCase): def setUp(self): diff --git a/service/test/unit/adapter/test_mailbox.py b/service/test/unit/adapter/test_mailbox.py index 5644969f..34777071 100644 --- a/service/test/unit/adapter/test_mailbox.py +++ b/service/test/unit/adapter/test_mailbox.py @@ -17,7 +17,7 @@ import unittest from pixelated.adapter.model.mail import PixelatedMail from pixelated.adapter.services.mailbox import Mailbox -from mockito import * +from mockito import mock, when, verify from test.support import test_helper diff --git a/service/test/unit/adapter/test_mailbox_indexer_listener.py b/service/test/unit/adapter/test_mailbox_indexer_listener.py index 65ba8966..71c9cd15 100644 --- a/service/test/unit/adapter/test_mailbox_indexer_listener.py +++ b/service/test/unit/adapter/test_mailbox_indexer_listener.py @@ -15,7 +15,7 @@ # along with Pixelated. If not, see . import unittest -from mockito import * +from mockito import mock, when, verify from pixelated.adapter.listeners.mailbox_indexer_listener import MailboxIndexerListener diff --git a/service/test/unit/resources/test_sync_info_controller.py b/service/test/unit/resources/test_sync_info_controller.py index a91dd386..1285237b 100644 --- a/service/test/unit/resources/test_sync_info_controller.py +++ b/service/test/unit/resources/test_sync_info_controller.py @@ -18,7 +18,7 @@ import json from test.support.test_helper import request_mock from pixelated.resources.sync_info_resource import SyncInfoResource -from mockito import * +from mockito import mock class SyncInfoResourceTest(unittest.TestCase): -- cgit v1.2.3