summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2016-02-25 11:34:45 -0600
committerRuben Pollan <meskio@sindominio.net>2016-02-25 11:35:26 -0600
commitd44d72c816ebc668931071cf5bd8e37e0be32e05 (patch)
treed25582505e83cd8d9fd4c29aacd4f2de7187249b
parent1b4d08537e2a526e8f5a76dbe7c7f6d979025296 (diff)
[test] refactor key deletion tests
-rw-r--r--src/leap/keymanager/tests/__init__.py30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/leap/keymanager/tests/__init__.py b/src/leap/keymanager/tests/__init__.py
index 4fbf63ee..20d05e8e 100644
--- a/src/leap/keymanager/tests/__init__.py
+++ b/src/leap/keymanager/tests/__init__.py
@@ -54,6 +54,14 @@ class KeyManagerWithSoledadTestCase(unittest.TestCase, BaseLeapTest):
def tearDown(self):
km = self._key_manager()
+ # wait for the indexes to be ready for the tear down
+ d = km._wrapper_map[OpenPGPKey].deferred_init
+ d.addCallback(lambda _: self.delete_all_keys(km))
+ d.addCallback(lambda _: self.tearDownEnv())
+ d.addCallback(lambda _: self._soledad.close())
+ return d
+
+ def delete_all_keys(self, km):
def delete_keys(keys):
deferreds = []
for key in keys:
@@ -61,26 +69,18 @@ class KeyManagerWithSoledadTestCase(unittest.TestCase, BaseLeapTest):
deferreds.append(d)
return gatherResults(deferreds)
- def get_and_delete_keys(_):
- deferreds = []
- for private in [True, False]:
- d = km.get_all_keys(private=private)
- d.addCallback(delete_keys)
- d.addCallback(check_deleted, private)
- deferreds.append(d)
- return gatherResults(deferreds)
-
def check_deleted(_, private):
d = km.get_all_keys(private=private)
d.addCallback(lambda keys: self.assertEqual(keys, []))
return d
- # wait for the indexes to be ready for the tear down
- d = km._wrapper_map[OpenPGPKey].deferred_init
- d.addCallback(get_and_delete_keys)
- d.addCallback(lambda _: self.tearDownEnv())
- d.addCallback(lambda _: self._soledad.close())
- return d
+ deferreds = []
+ for private in [True, False]:
+ d = km.get_all_keys(private=private)
+ d.addCallback(delete_keys)
+ d.addCallback(check_deleted, private)
+ deferreds.append(d)
+ return gatherResults(deferreds)
def _key_manager(self, user=ADDRESS, url='', token=None,
ca_cert_path=None):