diff options
author | Ruben Pollan <meskio@sindominio.net> | 2016-05-01 15:23:15 -0300 |
---|---|---|
committer | Ruben Pollan <meskio@sindominio.net> | 2016-06-01 18:49:15 +0200 |
commit | 4612ba27e83e478baac5a5f8b3037608774934d6 (patch) | |
tree | ba396dbd33acfaae5db83ca9890c729df068d41f /src/leap/keymanager/tests/__init__.py | |
parent | e7583ac12e0d594bb0be648b62a9d58eff3bf631 (diff) |
[feat] remove the keytype support
- Resolves: #8031
Diffstat (limited to 'src/leap/keymanager/tests/__init__.py')
-rw-r--r-- | src/leap/keymanager/tests/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/leap/keymanager/tests/__init__.py b/src/leap/keymanager/tests/__init__.py index 2a6a3f1..a20e1fd 100644 --- a/src/leap/keymanager/tests/__init__.py +++ b/src/leap/keymanager/tests/__init__.py @@ -27,7 +27,6 @@ from twisted.trial import unittest from leap.common.testing.basetest import BaseLeapTest from leap.soledad.client import Soledad from leap.keymanager import KeyManager -from leap.keymanager.openpgp import OpenPGPKey PATH = os.path.dirname(os.path.realpath(__file__)) @@ -56,7 +55,7 @@ class KeyManagerWithSoledadTestCase(unittest.TestCase, BaseLeapTest): km = self._key_manager() # wait for the indexes to be ready for the tear down - d = km._wrapper_map[OpenPGPKey].deferred_init + d = km._openpgp.deferred_init d.addCallback(lambda _: self.delete_all_keys(km)) d.addCallback(lambda _: self.tearDownEnv()) d.addCallback(lambda _: self._soledad.close()) @@ -66,7 +65,7 @@ class KeyManagerWithSoledadTestCase(unittest.TestCase, BaseLeapTest): def delete_keys(keys): deferreds = [] for key in keys: - d = km._wrapper_map[key.__class__].delete_key(key) + d = km._openpgp.delete_key(key) deferreds.append(d) return gatherResults(deferreds) |