diff options
author | Ruben Pollan <meskio@sindominio.net> | 2016-05-25 17:23:42 +0200 |
---|---|---|
committer | Ruben Pollan <meskio@sindominio.net> | 2016-05-25 17:25:50 +0200 |
commit | 756159dc0f7715cac70b79d5a72fce190a380e58 (patch) | |
tree | 6503976e20d2e8b5f15cefa3801aa1dc9c0ee7f4 /src/leap/keymanager/tests/__init__.py | |
parent | 8ebea34d6f7ec5a30b301b4f3e40fe89890464c6 (diff) | |
parent | 50f7d3a976c3867a17bc3da9e9873fa179b43f82 (diff) |
Merge remote-tracking branch 'pixelated/6200_add_support_for_binary_key' into develop
- Resolves: #6200
Diffstat (limited to 'src/leap/keymanager/tests/__init__.py')
-rw-r--r-- | src/leap/keymanager/tests/__init__.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/leap/keymanager/tests/__init__.py b/src/leap/keymanager/tests/__init__.py index 20d05e8..2a6a3f1 100644 --- a/src/leap/keymanager/tests/__init__.py +++ b/src/leap/keymanager/tests/__init__.py @@ -29,6 +29,7 @@ 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__)) ADDRESS = 'leap@leap.se' ADDRESS_2 = 'anotheruser@leap.se' @@ -95,6 +96,14 @@ class KeyManagerWithSoledadTestCase(unittest.TestCase, BaseLeapTest): else: return "/usr/bin/gpg" + def get_public_binary_key(self): + with open(PATH + '/fixtures/public_key.bin', 'r') as binary_public_key: + return binary_public_key.read() + + def get_private_binary_key(self): + with open(PATH + '/fixtures/private_key.bin', 'r') as binary_private_key: + return binary_private_key.read() + # key 24D18DDF: public key "Leap Test Key <leap@leap.se>" KEY_FINGERPRINT = "E36E738D69173C13D709E44F2F455E2824D18DDF" |