openstack/glance
Code Issues Proposed changes

Merge "Fix glance.tests.unit.v1.test_registry_client"

Browse Source
This commit is contained in:
Jenkins
2015-11-27 00:03:35 +00:00
committed by Gerrit Code Review
parent 186b13846b 478dc0ef29
commit cb9518c948
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
glance/common/client.py
View File

@@ -384,7 +384,7 @@ class BaseClient(object):
netloc = "%s:%d" % (self.host, self.port) netloc = "%s:%d" % (self.host, self.port)
if isinstance(params, dict): if isinstance(params, dict):
for (key, value) in params.items(): for (key, value) in list(params.items()):
if value is None: if value is None:
del params[key] del params[key]
continue continue
@@ -411,7 +411,10 @@ class BaseClient(object):
:returns: Dictionary with encoded headers' :returns: Dictionary with encoded headers'
names and values names and values
""" """
to_str = encodeutils.safe_encode if six.PY3:
to_str = str
else:
to_str = encodeutils.safe_encode
return {to_str(h): to_str(v) for h, v in six.iteritems(headers)} return {to_str(h): to_str(v) for h, v in six.iteritems(headers)}
@handle_redirects @handle_redirects

6
glance/registry/client/v1/client.py
View File

@@ -172,7 +172,7 @@ class RegistryClient(BaseClient):
encrypted_metadata = self.encrypt_metadata(image_metadata['image']) encrypted_metadata = self.encrypt_metadata(image_metadata['image'])
image_metadata['image'] = encrypted_metadata image_metadata['image'] = encrypted_metadata
body = jsonutils.dumps(image_metadata) body = jsonutils.dump_as_bytes(image_metadata)
res = self.do_request("POST", "/images", body=body, headers=headers) res = self.do_request("POST", "/images", body=body, headers=headers)
# Registry returns a JSONified dict(image=image_info) # Registry returns a JSONified dict(image=image_info)
@@ -191,7 +191,7 @@ class RegistryClient(BaseClient):
encrypted_metadata = self.encrypt_metadata(image_metadata['image']) encrypted_metadata = self.encrypt_metadata(image_metadata['image'])
image_metadata['image'] = encrypted_metadata image_metadata['image'] = encrypted_metadata
image_metadata['from_state'] = from_state image_metadata['from_state'] = from_state
body = jsonutils.dumps(image_metadata) body = jsonutils.dump_as_bytes(image_metadata)
headers = { headers = {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
@@ -235,7 +235,7 @@ class RegistryClient(BaseClient):
'memberships' not in member_data): 'memberships' not in member_data):
member_data = dict(memberships=[member_data]) member_data = dict(memberships=[member_data])
body = jsonutils.dumps(member_data) body = jsonutils.dump_as_bytes(member_data)
headers = {'Content-Type': 'application/json', } headers = {'Content-Type': 'application/json', }

3
glance/tests/unit/v1/test_registry_client.py
View File

@@ -20,6 +20,7 @@ import uuid
from mock import patch from mock import patch
from oslo_utils import timeutils from oslo_utils import timeutils
from six.moves import reload_module
import testtools import testtools
from glance.api.v1.images import Controller as acontroller from glance.api.v1.images import Controller as acontroller
@@ -843,7 +844,7 @@ class TestRegistryV1ClientApi(base.IsolatedUnitTest):
"""Establish a clean test environment.""" """Establish a clean test environment."""
super(TestRegistryV1ClientApi, self).setUp() super(TestRegistryV1ClientApi, self).setUp()
self.context = context.RequestContext() self.context = context.RequestContext()
reload(rapi) reload_module(rapi)
def tearDown(self): def tearDown(self):
"""Clear the test environment.""" """Clear the test environment."""

1
tox.ini
View File

@@ -79,6 +79,7 @@ commands =
glance.tests.unit.test_store_location \ glance.tests.unit.test_store_location \
glance.tests.unit.test_versions \ glance.tests.unit.test_versions \
glance.tests.unit.v1.test_registry_api \ glance.tests.unit.v1.test_registry_api \
glance.tests.unit.v1.test_registry_client \
glance.tests.unit.v1.test_upload_utils \ glance.tests.unit.v1.test_upload_utils \
glance.tests.unit.v2.test_image_actions_resource \ glance.tests.unit.v2.test_image_actions_resource \
glance.tests.unit.v2.test_image_data_resource \ glance.tests.unit.v2.test_image_data_resource \