openstack/python-cinderclient
Code Issues Proposed changes

Fix malformed encryption-type body in test cases

Browse Source 
This change addresses bug #1286261 and fixes two malformed
encryption-type bodies in two test_create test cases.

Change-Id: I308561c1d5a70812889a93922e13194597f670f1
Closes-Bug: #1286261
This commit is contained in:
Peter Hamilton
2014-02-28 13:09:27 -05:00
committed by Gerrit Code Review
parent eb301ec6ad
commit 51ffb26437
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cinderclient/tests/v1/test_volume_encryption_types.py
View File

@@ -73,12 +73,11 @@ class VolumeEncryptionTypesTest(utils.TestCase):
Verify that one POST request is made for the encryption type creation. Verify that one POST request is made for the encryption type creation.
Verify that encryption type creation returns a VolumeEncryptionType. Verify that encryption type creation returns a VolumeEncryptionType.
""" """
result = cs.volume_encryption_types.create(2, {'encryption': result = cs.volume_encryption_types.create(2, {'provider': 'Test',
{'provider': 'Test',
'key_size': None, 'key_size': None,
'cipher': None, 'cipher': None,
'control_location': 'control_location':
None}}) None})
cs.assert_called('POST', '/types/2/encryption') cs.assert_called('POST', '/types/2/encryption')
self.assertIsInstance(result, VolumeEncryptionType) self.assertIsInstance(result, VolumeEncryptionType)

5
cinderclient/tests/v2/test_volume_encryption_types.py
View File

@@ -73,12 +73,11 @@ class VolumeEncryptionTypesTest(utils.TestCase):
Verify that one POST request is made for the encryption type creation. Verify that one POST request is made for the encryption type creation.
Verify that encryption type creation returns a VolumeEncryptionType. Verify that encryption type creation returns a VolumeEncryptionType.
""" """
result = cs.volume_encryption_types.create(2, {'encryption': result = cs.volume_encryption_types.create(2, {'provider': 'Test',
{'provider': 'Test',
'key_size': None, 'key_size': None,
'cipher': None, 'cipher': None,
'control_location': 'control_location':
None}}) None})
cs.assert_called('POST', '/types/2/encryption') cs.assert_called('POST', '/types/2/encryption')
self.assertIsInstance(result, VolumeEncryptionType) self.assertIsInstance(result, VolumeEncryptionType)