openstack/castellan
Code Issues Proposed changes

Merge "MockKeyManager create_key change key_length to length"

Browse Source
This commit is contained in:
Jenkins 2016-04-04 16:01:01 +00:00 committed by Gerrit Code Review
commit 62e6648ffb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
castellan/tests/unit/key_manager/mock_key_manager.py
View File

@ -67,7 +67,7 @@ class MockKeyManager(key_manager.KeyManager):
def _generate_key(self, **kwargs): def _generate_key(self, **kwargs):
name = kwargs.get('name', None) name = kwargs.get('name', None)
algorithm = kwargs.get('algorithm', 'AES') algorithm = kwargs.get('algorithm', 'AES')
key_length = kwargs.get('key_length', 256) key_length = kwargs.get('length', 256)
_hex = self._generate_hex_key(key_length) _hex = self._generate_hex_key(key_length)
return sym_key.SymmetricKey( return sym_key.SymmetricKey(
algorithm, algorithm,

2
castellan/tests/unit/key_manager/test_mock_key_manager.py
View File

@ -62,7 +62,7 @@ class MockKeyManagerTestCase(test_key_mgr.KeyManagerTestCase):
def test_create_key_with_length(self): def test_create_key_with_length(self):
for length in [64, 128, 256]: for length in [64, 128, 256]:
key_id = self.key_mgr.create_key(self.context, key_length=length) key_id = self.key_mgr.create_key(self.context, length=length)
key = self.key_mgr.get(self.context, key_id) key = self.key_mgr.get(self.context, key_id)
self.assertEqual(length / 8, len(key.get_encoded())) self.assertEqual(length / 8, len(key.get_encoded()))