summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-05-18 12:49:23 -0300
committerdrebs <drebs@leap.se>2013-05-18 12:58:16 -0300
commit2a78ab3c730ba652153deaed55cfa8d92089a979 (patch)
treef3ef79fef1db60f84d13c3d0cd1d93d46364d6a1 /src/leap
parent9d07bbae0a4d9c64603481a9452b99cbff0f435e (diff)
Adapt keymanager tests for latest Soledad api.
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/common/tests/test_keymanager.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/leap/common/tests/test_keymanager.py b/src/leap/common/tests/test_keymanager.py
index d71167c..48f7273 100644
--- a/src/leap/common/tests/test_keymanager.py
+++ b/src/leap/common/tests/test_keymanager.py
@@ -143,16 +143,17 @@ class KeyManagerWithSoledadTestCase(BaseLeapTest):
def setUp(self):
# mock key fetching and storing so Soledad doesn't fail when trying to
# reach the server.
- Soledad._fetch_keys_from_shared_db = Mock(return_value=None)
- Soledad._assert_keys_in_shared_db = Mock(return_value=None)
+ Soledad._get_secrets_from_shared_db = Mock(return_value=None)
+ Soledad._put_secrets_in_shared_db = Mock(return_value=None)
self._soledad = Soledad(
"leap@leap.se",
"123456",
- secret_path=self.tempdir+"/secret.gpg",
- local_db_path=self.tempdir+"/soledad.u1db",
- server_url='',
- cert_file=None,
+ self.tempdir+"/secret.gpg",
+ self.tempdir+"/soledad.u1db",
+ '',
+ None,
+ auth_token=None,
)
def tearDown(self):