diff options
| author | Kali Kaneko <kali@leap.se> | 2014-04-09 14:39:06 -0500 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-04-09 14:39:06 -0500 |
| commit | 9490db0a41577ddde3affdfbba154b4f80fd24d9 (patch) | |
| tree | d8fc043a2fd75de12de85b6d08a38f4d73b76639 /src/leap/keymanager/tests/test_keymanager.py | |
| parent | 9c3c2ea07eb0d833765220e690d4ecd2b7b3cf40 (diff) | |
| parent | b25f3ae5ecaa70abaf80edc62931b5980c14e637 (diff) | |
Merge tag '0.3.8' into deb-0.3.8
Tag leap.keymanager version 0.3.8
Conflicts:
pkg/requirements.pip
Diffstat (limited to 'src/leap/keymanager/tests/test_keymanager.py')
| -rw-r--r-- | src/leap/keymanager/tests/test_keymanager.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/leap/keymanager/tests/test_keymanager.py b/src/leap/keymanager/tests/test_keymanager.py index 67676e9..e2558e4 100644 --- a/src/leap/keymanager/tests/test_keymanager.py +++ b/src/leap/keymanager/tests/test_keymanager.py @@ -118,9 +118,21 @@ class KeyManagerWithSoledadTestCase(BaseLeapTest): Soledad._get_secrets_from_shared_db = Mock(return_value=None) Soledad._put_secrets_in_shared_db = Mock(return_value=None) + class MockSharedDB(object): + + get_doc = Mock(return_value=None) + put_doc = Mock() + lock = Mock(return_value=('atoken', 300)) + unlock = Mock(return_value=True) + + def __call__(self): + return self + + Soledad._shared_db = MockSharedDB() + self._soledad = Soledad( - "leap@leap.se", - "123456", + u"leap@leap.se", + u"123456", secrets_path=self.tempdir + "/secret.gpg", local_db_path=self.tempdir + "/soledad.u1db", server_url='', |