diff options
author | Kali Kaneko <kali@leap.se> | 2015-10-06 16:01:25 -0400 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2015-10-06 16:01:25 -0400 |
commit | f404e4abc426ce08850283345ce162fb9b5403cf (patch) | |
tree | 1cef68094f840e960db784762aa8c10c60b5e15b /src/leap/keymanager/tests/__init__.py | |
parent | a4be602e5882a566b5b484deaa97f544602a309c (diff) | |
parent | 9a9c53eea49092e80737c84a2f850dd682c33ae3 (diff) |
Merge branch 'develop' into debian/experimental
pre-release for 0.4.3
Diffstat (limited to 'src/leap/keymanager/tests/__init__.py')
-rw-r--r-- | src/leap/keymanager/tests/__init__.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/leap/keymanager/tests/__init__.py b/src/leap/keymanager/tests/__init__.py index 7128d20..cd612c4 100644 --- a/src/leap/keymanager/tests/__init__.py +++ b/src/leap/keymanager/tests/__init__.py @@ -66,18 +66,27 @@ class KeyManagerWithSoledadTestCase(unittest.TestCase, BaseLeapTest): 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_indexes d.addCallback(get_and_delete_keys) d.addCallback(lambda _: self.tearDownEnv()) + d.addCallback(lambda _: self._soledad.close()) return d - def _key_manager(self, user=ADDRESS, url='', token=None): + def _key_manager(self, user=ADDRESS, url='', token=None, + ca_cert_path=None): return KeyManager(user, url, self._soledad, token=token, - gpgbinary=self.gpg_binary_path) + gpgbinary=self.gpg_binary_path, + ca_cert_path=ca_cert_path) def _find_gpg(self): gpg_path = distutils.spawn.find_executable('gpg') @@ -88,6 +97,7 @@ class KeyManagerWithSoledadTestCase(unittest.TestCase, BaseLeapTest): # key 24D18DDF: public key "Leap Test Key <leap@leap.se>" +KEY_ID = "2F455E2824D18DDF" KEY_FINGERPRINT = "E36E738D69173C13D709E44F2F455E2824D18DDF" PUBLIC_KEY = """ -----BEGIN PGP PUBLIC KEY BLOCK----- |