diff options
| author | drebs <drebs@leap.se> | 2013-04-03 14:28:07 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-04-03 14:28:07 -0300 |
| commit | d547d8e465d28838249e2576b598f009d0000333 (patch) | |
| tree | 4f407fcd6d7e750a497561e5766e105270619a6e /src/leap/soledad/tests | |
| parent | 3fffd731552426c67d1255fd5ba3b4a36964efe4 (diff) | |
| parent | 138bf574406b6533e0eeb59a7a19b0edeb97e9b7 (diff) | |
Merge branch 'feature/pysqlcipher-dependency' into develop
Diffstat (limited to 'src/leap/soledad/tests')
| -rw-r--r-- | src/leap/soledad/tests/__init__.py | 2 | ||||
| -rw-r--r-- | src/leap/soledad/tests/test_crypto.py | 2 | ||||
| -rw-r--r-- | src/leap/soledad/tests/test_sqlcipher.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/leap/soledad/tests/__init__.py b/src/leap/soledad/tests/__init__.py index 1ed2e248..8ceafe99 100644 --- a/src/leap/soledad/tests/__init__.py +++ b/src/leap/soledad/tests/__init__.py @@ -6,7 +6,7 @@ import u1db from leap.soledad import Soledad from leap.soledad.util import GPGWrapper from leap.soledad.backends.leap_backend import LeapDocument -from leap.testing.basetest import BaseLeapTest +from leap.common.testing.basetest import BaseLeapTest #----------------------------------------------------------------------------- diff --git a/src/leap/soledad/tests/test_crypto.py b/src/leap/soledad/tests/test_crypto.py index 52cc0315..a92e2c46 100644 --- a/src/leap/soledad/tests/test_crypto.py +++ b/src/leap/soledad/tests/test_crypto.py @@ -1,5 +1,5 @@ import os -from leap.testing.basetest import BaseLeapTest +from leap.common.testing.basetest import BaseLeapTest from leap.soledad.backends.leap_backend import LeapDocument from leap.soledad.tests import BaseSoledadTest from leap.soledad.tests import ( diff --git a/src/leap/soledad/tests/test_sqlcipher.py b/src/leap/soledad/tests/test_sqlcipher.py index 7b8f6298..23847556 100644 --- a/src/leap/soledad/tests/test_sqlcipher.py +++ b/src/leap/soledad/tests/test_sqlcipher.py @@ -30,7 +30,7 @@ from leap.soledad.tests.u1db_tests import test_backends from leap.soledad.tests.u1db_tests import test_open from leap.soledad.tests.u1db_tests import test_sync from leap.soledad.backends.leap_backend import LeapSyncTarget -from leap.testing.basetest import BaseLeapTest +from leap.common.testing.basetest import BaseLeapTest PASSWORD = '123456' |