From 75b633a173f217ccd508cf6b5306a3e93f79c2e6 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Tue, 18 Oct 2016 20:08:39 -0200 Subject: Adapted imports to reflect new bitmask-dev dependency --- .../mailstore/maintenance/test_soledad_maintenance.py | 2 +- .../unit/adapter/mailstore/test_leap_attachment_store.py | 8 ++++---- service/test/unit/adapter/mailstore/test_leap_mailstore.py | 14 +++++++------- service/test/unit/adapter/services/test_mail_sender.py | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'service/test/unit/adapter') diff --git a/service/test/unit/adapter/mailstore/maintenance/test_soledad_maintenance.py b/service/test/unit/adapter/mailstore/maintenance/test_soledad_maintenance.py index be73af93..2aaa969c 100644 --- a/service/test/unit/adapter/mailstore/maintenance/test_soledad_maintenance.py +++ b/service/test/unit/adapter/mailstore/maintenance/test_soledad_maintenance.py @@ -19,7 +19,7 @@ from twisted.internet import defer from twisted.trial import unittest from mockito import mock, when, verify, never from pixelated.adapter.mailstore.maintenance import SoledadMaintenance -from leap.keymanager.openpgp import OpenPGPKey +from leap.bitmask.keymanager.openpgp import OpenPGPKey import logging logging.getLogger('pixelated.adapter.mailstore.maintenance').addHandler(logging.NullHandler()) diff --git a/service/test/unit/adapter/mailstore/test_leap_attachment_store.py b/service/test/unit/adapter/mailstore/test_leap_attachment_store.py index f442b687..2d3daaaa 100644 --- a/service/test/unit/adapter/mailstore/test_leap_attachment_store.py +++ b/service/test/unit/adapter/mailstore/test_leap_attachment_store.py @@ -16,15 +16,15 @@ # along with Pixelated. If not, see . import json from uuid import uuid4 -import u1db -from leap.mail.adaptors.soledad_indexes import MAIL_INDEXES +from leap.soledad.common import l2db +from leap.bitmask.mail.adaptors.soledad_indexes import MAIL_INDEXES from leap.soledad.common.document import SoledadDocument from mock import patch from mockito import mock, when, verify from twisted.internet import defer from twisted.trial.unittest import TestCase -from leap.mail.adaptors.soledad import SoledadMailAdaptor, MailboxWrapper, ContentDocWrapper +from leap.bitmask.mail.adaptors.soledad import SoledadMailAdaptor, MailboxWrapper, ContentDocWrapper from pixelated.adapter.mailstore.leap_attachment_store import LeapAttachmentStore from test.support.mockito import AnswerSelector @@ -84,7 +84,7 @@ class TestLeapAttachmentStore(TestCase): store = LeapAttachmentStore(self.soledad) - when(self.soledad).create_doc(cdoc_serialized, doc_id=attachment_id).thenRaise(u1db.errors.RevisionConflict()) + when(self.soledad).create_doc(cdoc_serialized, doc_id=attachment_id).thenRaise(l2db.errors.RevisionConflict()) actual_attachment_id = yield store.add_attachment(content, content_type) diff --git a/service/test/unit/adapter/mailstore/test_leap_mailstore.py b/service/test/unit/adapter/mailstore/test_leap_mailstore.py index 62c8ac7a..5e897dd7 100644 --- a/service/test/unit/adapter/mailstore/test_leap_mailstore.py +++ b/service/test/unit/adapter/mailstore/test_leap_mailstore.py @@ -25,16 +25,16 @@ from uuid import uuid4 from email.parser import Parser import os from leap.soledad.common.document import SoledadDocument -from leap.mail.adaptors.soledad_indexes import MAIL_INDEXES +from leap.bitmask.mail.adaptors.soledad_indexes import MAIL_INDEXES from twisted.internet.defer import FirstError from twisted.trial.unittest import TestCase -from leap.mail import constants +from leap.bitmask.mail import constants from twisted.internet import defer from mock import patch from mockito import mock, when, verify, any as ANY -from leap.mail.adaptors.soledad import SoledadMailAdaptor, MailboxWrapper, ContentDocWrapper +from leap.bitmask.mail.adaptors.soledad import SoledadMailAdaptor, MailboxWrapper, ContentDocWrapper import pkg_resources -from leap.mail.mail import Message +from leap.bitmask.mail.mail import Message from pixelated.adapter.mailstore import underscore_uuid from pixelated.adapter.mailstore.leap_mailstore import LeapMailStore, LeapMail @@ -242,7 +242,7 @@ class TestLeapMailStore(TestCase): message = yield store.add_mail('INBOX', input_mail.as_string()) - expected = [{'ident': self._cdoc_phash_from_message(mocked_message, 2), 'name': 'filename.txt', 'encoding': 'base64', 'size': 197, 'content-type': 'application/octet-stream'}] + expected = [{'ident': self._cdoc_phash_from_message(mocked_message, 2), 'name': 'filename.txt', 'encoding': 'base64', 'size': 48, 'content-type': 'application/octet-stream'}] self.assertEqual(expected, message.as_dict()['attachments']) @defer.inlineCallbacks @@ -257,7 +257,7 @@ class TestLeapMailStore(TestCase): message = yield store.add_mail('INBOX', input_mail.as_string()) - expected = [{'ident': self._cdoc_phash_from_message(mocked_message, 2), 'name': 'super_nice_photo.jpg', 'encoding': 'base64', 'size': 202, 'content-type': 'application/octet-stream'}] + expected = [{'ident': self._cdoc_phash_from_message(mocked_message, 2), 'name': 'super_nice_photo.jpg', 'encoding': 'base64', 'size': 48, 'content-type': 'application/octet-stream'}] self.assertEqual(expected, message.as_dict()['attachments']) @defer.inlineCallbacks @@ -274,7 +274,7 @@ class TestLeapMailStore(TestCase): message = yield store.add_mail('INBOX', input_mail.as_string()) - expected = [{'ident': self._cdoc_phash_from_message(mocked_message, 2), 'name': 'filename.txt', 'encoding': 'base64', 'size': 197, 'content-type': 'application/octet-stream'}] + expected = [{'ident': self._cdoc_phash_from_message(mocked_message, 2), 'name': 'filename.txt', 'encoding': 'base64', 'size': 48, 'content-type': 'application/octet-stream'}] self.assertEqual(expected, message.as_dict()['attachments']) def test_extract_attachment_filename_with_or_without_quotes(self): diff --git a/service/test/unit/adapter/services/test_mail_sender.py b/service/test/unit/adapter/services/test_mail_sender.py index 863ac81a..4daa7f24 100644 --- a/service/test/unit/adapter/services/test_mail_sender.py +++ b/service/test/unit/adapter/services/test_mail_sender.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see . -from leap.mail.outgoing.service import OutgoingMail +from leap.bitmask.mail.outgoing.service import OutgoingMail from twisted.mail.smtp import User from twisted.trial import unittest -- cgit v1.2.3