summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/mail/testing
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2016-09-01 00:12:28 -0400
committerKali Kaneko (leap communications) <kali@leap.se>2016-09-01 00:52:34 -0400
commit662aed784218a45efbf563ff6150fcb9f1aa81aa (patch)
tree9ac2f47fb24f50d3ada1a4a4a0819d6ef909901e /src/leap/bitmask/mail/testing
parent2a46b146135aa5694eb9de288c24037051268fdf (diff)
[refactor] fix imports after merging submodules
Diffstat (limited to 'src/leap/bitmask/mail/testing')
-rw-r--r--src/leap/bitmask/mail/testing/__init__.py7
-rw-r--r--src/leap/bitmask/mail/testing/imap.py10
-rw-r--r--src/leap/bitmask/mail/testing/smtp.py6
3 files changed, 10 insertions, 13 deletions
diff --git a/src/leap/bitmask/mail/testing/__init__.py b/src/leap/bitmask/mail/testing/__init__.py
index 8822a5c..b5a2a42 100644
--- a/src/leap/bitmask/mail/testing/__init__.py
+++ b/src/leap/bitmask/mail/testing/__init__.py
@@ -24,12 +24,9 @@ from twisted.internet.defer import gatherResults
from twisted.trial import unittest
from twisted.internet import defer
-
-from leap.soledad.client import Soledad
-from leap.keymanager import KeyManager
-
-
from leap.common.testing.basetest import BaseLeapTest
+from leap.bitmask.keymanager import KeyManager
+from leap.soledad.client import Soledad
ADDRESS = 'leap@leap.se'
ADDRESS_2 = 'anotheruser@leap.se'
diff --git a/src/leap/bitmask/mail/testing/imap.py b/src/leap/bitmask/mail/testing/imap.py
index 72acbf2..75ee9c7 100644
--- a/src/leap/bitmask/mail/testing/imap.py
+++ b/src/leap/bitmask/mail/testing/imap.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# utils.py
-# Copyright (C) 2014, 2015 LEAP
+# Copyright (C) 2014-2016 LEAP
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -30,10 +30,10 @@ from twisted.protocols import loopback
from twisted.python import log
from zope.interface import implementer
-from leap.mail.adaptors import soledad as soledad_adaptor
-from leap.mail.imap.account import IMAPAccount
-from leap.mail.imap.server import LEAPIMAPServer
-from leap.mail.testing.common import SoledadTestMixin
+from leap.bitmask.mail.adaptors import soledad as soledad_adaptor
+from leap.bitmask.mail.imap.account import IMAPAccount
+from leap.bitmask.mail.imap.server import LEAPIMAPServer
+from leap.bitmask.mail.testing.common import SoledadTestMixin
TEST_USER = "testuser@leap.se"
TEST_PASSWD = "1234"
diff --git a/src/leap/bitmask/mail/testing/smtp.py b/src/leap/bitmask/mail/testing/smtp.py
index d8690f1..834433f 100644
--- a/src/leap/bitmask/mail/testing/smtp.py
+++ b/src/leap/bitmask/mail/testing/smtp.py
@@ -1,8 +1,8 @@
from twisted.mail import smtp
-from leap.mail.smtp.gateway import SMTPFactory, LOCAL_FQDN
-from leap.mail.smtp.gateway import SMTPDelivery
-from leap.mail.outgoing.service import outgoingFactory
+from leap.bitmask.mail.smtp.gateway import SMTPFactory, LOCAL_FQDN
+from leap.bitmask.mail.smtp.gateway import SMTPDelivery
+from leap.bitmask.mail.outgoing.service import outgoingFactory
TEST_USER = u'anotheruser@leap.se'