diff options
Diffstat (limited to 'src/leap/bitmask/mail/testing')
| -rw-r--r-- | src/leap/bitmask/mail/testing/__init__.py | 14 | ||||
| -rw-r--r-- | src/leap/bitmask/mail/testing/common.py | 2 |
2 files changed, 2 insertions, 14 deletions
diff --git a/src/leap/bitmask/mail/testing/__init__.py b/src/leap/bitmask/mail/testing/__init__.py index afb8e437..54aaa87a 100644 --- a/src/leap/bitmask/mail/testing/__init__.py +++ b/src/leap/bitmask/mail/testing/__init__.py @@ -17,8 +17,6 @@ """ Base classes and keys for leap.mail tests. """ -import os -import distutils.spawn from mock import Mock from twisted.internet.defer import gatherResults from twisted.trial import unittest @@ -38,7 +36,6 @@ class defaultMockSharedDB(object): put_doc = Mock(side_effect=None) open = Mock(return_value=None) close = Mock(return_value=None) - syncable = True def __call__(self): return self @@ -58,7 +55,7 @@ class KeyManagerWithSoledadTestCase(unittest.TestCase, BaseLeapTest): cert_file=None, auth_token=None, shared_db=defaultMockSharedDB(), - syncable=False) + offline=True) self.km = self._key_manager() @@ -111,15 +108,6 @@ class KeyManagerWithSoledadTestCase(unittest.TestCase, BaseLeapTest): gpgbinary=self.gpg_binary_path, ca_cert_path=ca_cert_path) - def get_public_binary_key(self): - with open(PATH + '/fixtures/public_key.bin', 'r') as binary_public_key: - return binary_public_key.read() - - def get_private_binary_key(self): - with open( - PATH + '/fixtures/private_key.bin', 'r') as binary_private_key: - return binary_private_key.read() - # key 24D18DDF: public key "Leap Test Key <leap@leap.se>" KEY_FINGERPRINT = "E36E738D69173C13D709E44F2F455E2824D18DDF" diff --git a/src/leap/bitmask/mail/testing/common.py b/src/leap/bitmask/mail/testing/common.py index 1bf1de22..c77148da 100644 --- a/src/leap/bitmask/mail/testing/common.py +++ b/src/leap/bitmask/mail/testing/common.py @@ -57,7 +57,7 @@ def _initialize_soledad(email, gnupg_home, tempdir): local_db_path, server_url, cert_file, - syncable=False) + offline=True) return soledad |