summaryrefslogtreecommitdiff
path: root/keymanager/src
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-21 14:56:06 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-21 14:56:06 -0300
commit442d298f271f9065ee5d4b308aa3dc6662c258dc (patch)
tree8cc0d5b5faf8fb53afa3311388abe469e8795308 /keymanager/src
parent7d194296f69c97f67d117286086a0fcba3500dfe (diff)
parent82191866aa668e7ad294087c0365decf54588698 (diff)
Merge remote-tracking branch 'drebs/feature/3487-split-soledad-into-common-client-and-server' into develop
Diffstat (limited to 'keymanager/src')
-rw-r--r--keymanager/src/leap/keymanager/tests/test_keymanager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/keymanager/src/leap/keymanager/tests/test_keymanager.py b/keymanager/src/leap/keymanager/tests/test_keymanager.py
index a474e32a..5f232fed 100644
--- a/keymanager/src/leap/keymanager/tests/test_keymanager.py
+++ b/keymanager/src/leap/keymanager/tests/test_keymanager.py
@@ -23,7 +23,7 @@ Tests for the Key Manager.
from mock import Mock
from leap.common.testing.basetest import BaseLeapTest
-from leap.soledad import Soledad
+from leap.soledad.client import Soledad
from leap.keymanager import (
KeyManager,
openpgp,