diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-05-21 10:00:19 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-05-21 10:00:19 -0300 |
| commit | e5fa0790f5231c333aba4bc5f6766556e062aa6c (patch) | |
| tree | 6ffa31245438320da2934fda9aeb4f8248f0e3a7 /src/leap/mail/imap/tests/__init__.py | |
| parent | d24b8590ff06708032c3a7a5856b728d3fc48c9a (diff) | |
| parent | ffedb3b8e32c062604cc2f178213c82d90843788 (diff) | |
Merge remote-tracking branch 'kali/feature/imap-service2' into develop
Conflicts:
pkg/requirements.pip
src/leap/mail/imap/tests/test_imap.py
Diffstat (limited to 'src/leap/mail/imap/tests/__init__.py')
| -rw-r--r-- | src/leap/mail/imap/tests/__init__.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/leap/mail/imap/tests/__init__.py b/src/leap/mail/imap/tests/__init__.py index 9a4c663..315d649 100644 --- a/src/leap/mail/imap/tests/__init__.py +++ b/src/leap/mail/imap/tests/__init__.py @@ -48,18 +48,19 @@ class BaseSoledadIMAPTest(BaseLeapTest): document_factory=LeapDocument) self._db2 = u1db.open(self.db2_file, create=True, document_factory=LeapDocument) + # initialize soledad by hand so we can control keys self._soledad = Soledad(self.email, gnupg_home=self.gnupg_home, - initialize=False, + bootstrap=False, prefix=self.tempdir) self._soledad._init_dirs() self._soledad._gpg = GPGWrapper(gnupghome=self.gnupg_home) - self._soledad._gpg.import_keys(PUBLIC_KEY) - self._soledad._gpg.import_keys(PRIVATE_KEY) - self._soledad._load_openpgp_keypair() - if not self._soledad._has_secret(): - self._soledad._gen_secret() - self._soledad._load_secret() + + if not self._soledad._has_privkey(): + self._soledad._set_privkey(PRIVATE_KEY) + if not self._soledad._has_symkey(): + self._soledad._gen_symkey() + self._soledad._load_symkey() self._soledad._init_db() def tearDown(self): |