diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-21 14:55:24 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-21 14:55:24 -0300 |
| commit | 96be9573319456869c76de59b59e309a75fd15a6 (patch) | |
| tree | a13d2d75771e2e45ee07a94cf39c43083db20cbb /src/leap/mail/imap/tests | |
| parent | 35bdd37d15732af2cf59636ecf6970f147fd3747 (diff) | |
| parent | 410908917841bc2decbd4d00e04f75e2e6f1b88d (diff) | |
Merge remote-tracking branch 'drebs/feature/3487-split-soledad-into-common-client-and-server' into develop
Conflicts:
src/leap/mail/imap/fetch.py
src/leap/mail/imap/server.py
Diffstat (limited to 'src/leap/mail/imap/tests')
| -rw-r--r-- | src/leap/mail/imap/tests/__init__.py | 4 | ||||
| -rw-r--r-- | src/leap/mail/imap/tests/test_imap.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/leap/mail/imap/tests/__init__.py b/src/leap/mail/imap/tests/__init__.py index fdeda76..f3d5ca6 100644 --- a/src/leap/mail/imap/tests/__init__.py +++ b/src/leap/mail/imap/tests/__init__.py @@ -22,8 +22,8 @@ import u1db from leap.common.testing.basetest import BaseLeapTest -from leap.soledad import Soledad -from leap.soledad.document import SoledadDocument +from leap.soledad.client import Soledad +from leap.soledad.common.document import SoledadDocument #----------------------------------------------------------------------------- diff --git a/src/leap/mail/imap/tests/test_imap.py b/src/leap/mail/imap/tests/test_imap.py index 8804fe0..3411795 100644 --- a/src/leap/mail/imap/tests/test_imap.py +++ b/src/leap/mail/imap/tests/test_imap.py @@ -61,8 +61,8 @@ from leap.mail.imap.server import SoledadMailbox from leap.mail.imap.server import SoledadBackedAccount from leap.mail.imap.server import MessageCollection -from leap.soledad import Soledad -from leap.soledad import SoledadCrypto +from leap.soledad.client import Soledad +from leap.soledad.client import SoledadCrypto def strip(f): |