openstack/python-barbicanclient
Code Issues Proposed changes

Don't ignore payload_content_encoding if set

Browse Source 
Even though setting the payload_content_encoding is deprecated, we
should not ignore it if set.  Uncommented functional tests that found
this bug.  Removed a couple of tests because they were incorrect.

Change-Id: Idd294909ddd622d3baf2e8df92c94f8f52ac5799
Closes-Bug: #1434652
This commit is contained in:
Douglas Mendizábal
2015-03-26 16:43:36 -05:00
parent 4bfc836aec
commit 06709099de
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
barbicanclient/secrets.py
View File

@@ -267,7 +267,7 @@ class Secret(SecretFormatter):
raise exceptions.PayloadException("Missing Payload")
if not isinstance(self.payload, (six.text_type, six.binary_type)):
raise exceptions.PayloadException("Invalid Payload Type")
if self.payload_content_type:
if self.payload_content_type or self.payload_content_encoding:
"""
Setting the payload_content_type and payload_content_encoding
manually is deprecated. This clause of the if statement is here

23
functionaltests/client/v1/functional/test_secrets.py
View File

@@ -473,22 +473,13 @@ class SecretsTestCase(base.TestCase):
'payload_content_type': 'text/plain',
'payload_content_encoding': 'invalid'},
#Launchpad Bug (1434652)
# 'none_content_type_invalid_content_encoding': {
# 'payload_content_type': None,
# 'payload_content_encoding': 'invalid'},
#
# 'empty_content_type_and_encoding': {
# 'payload_content_type': '',
# 'payload_content_encoding': ''},
#
# 'none_content_type_and_encoding': {
# 'payload_content_type': None,
# 'payload_content_encoding': None},
#
# 'none_content_type_base64_content_encoding': {
# 'payload_content_type': None,
# 'payload_content_encoding': 'base64'}
'none_content_type_invalid_content_encoding': {
'payload_content_type': None,
'payload_content_encoding': 'invalid'},
'none_content_type_base64_content_encoding': {
'payload_content_type': None,
'payload_content_encoding': 'base64'}
})
@testcase.attr('negative')
def test_secret_create_defaults_invalid_types_and_encoding(self, **kwargs):