From aaf8867373694bab662771034186392bb9ee5369 Mon Sep 17 00:00:00 2001 From: Kaitlin Farr Date: Mon, 28 Mar 2016 00:00:24 -0400 Subject: [PATCH] MockKeyManager create_key change key_length to length MockKeyManager was using kwarg key_length, but this is not what is specified by the key manager interface. The proper name for the kward should be 'length'. Change-Id: I3b7685363e24a9c71b9019ee94c4b2842d2a95de --- castellan/tests/unit/key_manager/mock_key_manager.py | 2 +- castellan/tests/unit/key_manager/test_mock_key_manager.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/castellan/tests/unit/key_manager/mock_key_manager.py b/castellan/tests/unit/key_manager/mock_key_manager.py index 4d3cb445..0297b2c3 100644 --- a/castellan/tests/unit/key_manager/mock_key_manager.py +++ b/castellan/tests/unit/key_manager/mock_key_manager.py @@ -67,7 +67,7 @@ class MockKeyManager(key_manager.KeyManager): def _generate_key(self, **kwargs): name = kwargs.get('name', None) 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) return sym_key.SymmetricKey( algorithm, diff --git a/castellan/tests/unit/key_manager/test_mock_key_manager.py b/castellan/tests/unit/key_manager/test_mock_key_manager.py index 771f0984..f9d6428e 100644 --- a/castellan/tests/unit/key_manager/test_mock_key_manager.py +++ b/castellan/tests/unit/key_manager/test_mock_key_manager.py @@ -62,7 +62,7 @@ class MockKeyManagerTestCase(test_key_mgr.KeyManagerTestCase): def test_create_key_with_length(self): 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) self.assertEqual(length / 8, len(key.get_encoded()))