diff options
Diffstat (limited to 'src/leap')
| -rw-r--r-- | src/leap/bitmask/keymanager/testing/__init__.py | 14 | ||||
| -rw-r--r-- | src/leap/bitmask/mail/testing/common.py | 16 |
2 files changed, 29 insertions, 1 deletions
diff --git a/src/leap/bitmask/keymanager/testing/__init__.py b/src/leap/bitmask/keymanager/testing/__init__.py index 9001207f..3cc0c100 100644 --- a/src/leap/bitmask/keymanager/testing/__init__.py +++ b/src/leap/bitmask/keymanager/testing/__init__.py @@ -243,6 +243,19 @@ class KeyManagerWithSoledadTestCase(unittest.TestCase, BaseLeapTest): def setUp(self): self.gpg_binary_path = get_gpg_bin_path() + # TODO: we pass a fake shared database to soledad because we don't want + # it o try to reach network to lookup a stored secret in the shared + # database. This logic still has to be improved in soledad itself to + # account for tests, and when that is done we can remove this from + # here. + class FakeSharedDb(object): + + def get_doc(self, doc_id): + return None + + def put_doc(self, doc): + return None + self._soledad = Soledad( u"leap@leap.se", u"123456", @@ -252,6 +265,7 @@ class KeyManagerWithSoledadTestCase(unittest.TestCase, BaseLeapTest): cert_file=None, auth_token=None, offline=True, + shared_db=FakeSharedDb(), ) def tearDown(self): diff --git a/src/leap/bitmask/mail/testing/common.py b/src/leap/bitmask/mail/testing/common.py index c77148da..d969deef 100644 --- a/src/leap/bitmask/mail/testing/common.py +++ b/src/leap/bitmask/mail/testing/common.py @@ -50,6 +50,19 @@ def _initialize_soledad(email, gnupg_home, tempdir): server_url = "https://provider" cert_file = "" + # TODO: we pass a fake shared database to soledad because we don't want + # it o try to reach network to lookup a stored secret in the shared + # database. This logic still has to be improved in soledad itself to + # account for tests, and when that is done we can remove this from + # here. + class FakeSharedDb(object): + + def get_doc(self, doc_id): + return None + + def put_doc(self, doc): + return None + soledad = Soledad( uuid, passphrase, @@ -57,7 +70,8 @@ def _initialize_soledad(email, gnupg_home, tempdir): local_db_path, server_url, cert_file, - offline=True) + offline=True, + shared_db=FakeSharedDb()) return soledad |