diff options
| author | Victor Shyba <victor.shyba@gmail.com> | 2015-03-18 17:17:35 -0300 |
|---|---|---|
| committer | Victor Shyba <victor.shyba@gmail.com> | 2015-03-18 17:17:35 -0300 |
| commit | db7f2cc07eba1ac2275495c3eb045d5610b776d3 (patch) | |
| tree | cfa02f10f7f4d73803c5a41c8ba017833038848a /service/test/integration | |
| parent | bdba0f2fce00d53d445371be3c09cda01274d0e8 (diff) | |
cleaning import * from integration and unit tests
Diffstat (limited to 'service/test/integration')
| -rw-r--r-- | service/test/integration/test_delete_mail.py | 2 | ||||
| -rw-r--r-- | service/test/integration/test_drafts.py | 4 | ||||
| -rw-r--r-- | service/test/integration/test_mark_as_read_unread.py | 2 | ||||
| -rw-r--r-- | service/test/integration/test_search.py | 2 | ||||
| -rw-r--r-- | service/test/integration/test_soledad_querier.py | 2 | ||||
| -rw-r--r-- | service/test/integration/test_tags.py | 2 |
6 files changed, 7 insertions, 7 deletions
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 <http://www.gnu.org/licenses/>. -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 <http://www.gnu.org/licenses/>. -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 <http://www.gnu.org/licenses/>. -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 <http://www.gnu.org/licenses/>. -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 <http://www.gnu.org/licenses/>. import json -from test.support.integration import * +from test.support.integration import SoledadTestBase, MailBuilder from pixelated.adapter.services.tag_service import SPECIAL_TAGS |