diff options
| author | drebs <drebs@leap.se> | 2013-03-12 16:31:33 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-03-12 16:31:33 -0300 |
| commit | 163c0500a4a6fb9b11fe667fb7ee6d2822916cdb (patch) | |
| tree | e9a85ddec162c8aba2b00638358c0ee490e17f12 /src/leap/soledad/tests/__init__.py | |
| parent | ab1e1c8862b70d47c7e5f10267639ef71b3bc536 (diff) | |
| parent | 0b0384c4985210ba2763dc31de98afa59e3936e4 (diff) | |
Merge branch 'feature/bootstrap' into develop
Diffstat (limited to 'src/leap/soledad/tests/__init__.py')
| -rw-r--r-- | src/leap/soledad/tests/__init__.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/leap/soledad/tests/__init__.py b/src/leap/soledad/tests/__init__.py index fdde8c78..1ed2e248 100644 --- a/src/leap/soledad/tests/__init__.py +++ b/src/leap/soledad/tests/__init__.py @@ -32,16 +32,16 @@ class BaseSoledadTest(BaseLeapTest): 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() + #self._soledad._gpg.import_keys(PUBLIC_KEY) + 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): |