diff options
| author | Kali Kaneko (leap communications) <kali@leap.se> | 2016-09-20 16:45:11 -0400 |
|---|---|---|
| committer | Kali Kaneko (leap communications) <kali@leap.se> | 2016-09-20 16:45:11 -0400 |
| commit | 8332e974f019e0d0ca18f129b86398e1a826126d (patch) | |
| tree | f47d6464323d1a99e5e11630d503b1c41998e0e5 /tests/test_openpgp.py | |
| parent | ea0895e2d8a1f2def42ee6696d9a17b4fa20c065 (diff) | |
| parent | 2d9bec78f3f8c46f00f585cadae652d6e3aec904 (diff) | |
Merge branch 'develop' of ssh://leap.se/keymanager into develop
Diffstat (limited to 'tests/test_openpgp.py')
| -rw-r--r-- | tests/test_openpgp.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/test_openpgp.py b/tests/test_openpgp.py index 1f78ad4..60d2319 100644 --- a/tests/test_openpgp.py +++ b/tests/test_openpgp.py @@ -23,16 +23,13 @@ Tests for the OpenPGP support on Key Manager. from datetime import datetime from mock import Mock -from twisted.internet.defer import inlineCallbacks, gatherResults, succeed +from twisted.internet.defer import inlineCallbacks, succeed from leap.keymanager import ( KeyNotFound, openpgp, ) -from leap.keymanager.documents import ( - TYPE_FINGERPRINT_PRIVATE_INDEX, - TYPE_ADDRESS_PRIVATE_INDEX, -) +from leap.keymanager.documents import TYPE_FINGERPRINT_PRIVATE_INDEX from leap.keymanager.keys import OpenPGPKey from common import ( |