diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2016-05-01 16:52:48 -0300 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2016-06-01 18:49:15 +0200 |
| commit | 80993a5fb118bb46cc6da5847cbbd3f0bdc66e4e (patch) | |
| tree | 38c203f5569497f43e64db50b081241a5cbabf76 /src/leap/keymanager/tests | |
| parent | e37cdf35d275902e9bea393509b26e13a983fb0e (diff) | |
[refactor] move soledad document definitions to it's own file
Diffstat (limited to 'src/leap/keymanager/tests')
| -rw-r--r-- | src/leap/keymanager/tests/test_migrator.py | 2 | ||||
| -rw-r--r-- | src/leap/keymanager/tests/test_openpgp.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/leap/keymanager/tests/test_migrator.py b/src/leap/keymanager/tests/test_migrator.py index 2d9782b..76323e5 100644 --- a/src/leap/keymanager/tests/test_migrator.py +++ b/src/leap/keymanager/tests/test_migrator.py @@ -26,7 +26,7 @@ from mock import Mock from twisted.internet.defer import succeed, inlineCallbacks from leap.keymanager.migrator import KeyDocumentsMigrator, KEY_ID_KEY -from leap.keymanager.keys import ( +from leap.keymanager.documents import ( TAGS_PRIVATE_INDEX, KEYMANAGER_ACTIVE_TAG, KEYMANAGER_KEY_TAG, diff --git a/src/leap/keymanager/tests/test_openpgp.py b/src/leap/keymanager/tests/test_openpgp.py index 0e39dab..47e9005 100644 --- a/src/leap/keymanager/tests/test_openpgp.py +++ b/src/leap/keymanager/tests/test_openpgp.py @@ -29,7 +29,7 @@ from leap.keymanager import ( KeyNotFound, openpgp, ) -from leap.keymanager.keys import ( +from leap.keymanager.documents import ( TYPE_FINGERPRINT_PRIVATE_INDEX, TYPE_ADDRESS_PRIVATE_INDEX, ) @@ -57,7 +57,7 @@ class OpenPGPCryptoTestCase(KeyManagerWithSoledadTestCase): self._soledad, gpgbinary=self.gpg_binary_path) yield self._assert_key_not_found(pgp, 'user@leap.se') key = yield pgp.gen_key('user@leap.se') - self.assertIsInstance(key, openpgp.OpenPGPKey) + self.assertIsInstance(key, OpenPGPKey) self.assertEqual( ['user@leap.se'], key.address, 'Wrong address bound to key.') self.assertEqual( @@ -80,7 +80,7 @@ class OpenPGPCryptoTestCase(KeyManagerWithSoledadTestCase): yield self._assert_key_not_found(pgp, ADDRESS) yield pgp.put_raw_key(PUBLIC_KEY, ADDRESS) key = yield pgp.get_key(ADDRESS, private=False) - self.assertIsInstance(key, openpgp.OpenPGPKey) + self.assertIsInstance(key, OpenPGPKey) self.assertTrue( ADDRESS in key.address, 'Wrong address bound to key.') self.assertEqual( |