diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-01-17 17:52:22 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-01-17 17:52:22 -0300 |
| commit | 4c310ee3df8765b3df56b46e5837f5e332447c3d (patch) | |
| tree | fbe021dae6473eb19d8f81d0c37863a33a295984 /keymanager/src | |
| parent | a7839a6e839dcfe96f36e0787869bcc5d56ce769 (diff) | |
| parent | 9c4c725b35b66521d355a70ec0e211d43d4515c7 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/bug/fix-failing-tests' into develop
Diffstat (limited to 'keymanager/src')
| -rw-r--r-- | keymanager/src/leap/keymanager/tests/test_keymanager.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/keymanager/src/leap/keymanager/tests/test_keymanager.py b/keymanager/src/leap/keymanager/tests/test_keymanager.py index 67676e9..e2558e4 100644 --- a/keymanager/src/leap/keymanager/tests/test_keymanager.py +++ b/keymanager/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='', |