openstack/glance
Code Issues Proposed changes

Python 3: fix glance.tests.unit

Browse Source 
With this change, all Glance unit tests now pass on Python3!

* Replace dict.keys() with list(dict.keys()) to get a list on Python
  3. On Python 3, dict.keys() now returns a view, not a list
* Replace filter() with a list-comprehension with if, to get a list
  on Python 3.
* Don't encode HTTP headers to UTF-8 on Python 3. Python 3 already
  encodes them for us.
* On Python 3, decode the request identifier of the context to get
  a Unicode string.
* Replace jsonutils.dumps(obj) with jsonutils.dump_as_bytes() to
  create a HTTP body, since the HTTP body must be a bytes string.
* start_http_server(): use bytes for image data, not Unicode.
* Use byte strings to check HTTP body, not Unicode. Or on some unit
  tests, decode the HTTP body to get Unicode.
* Skip test on invalid unicode image property on Python 3. It's now
  supported on Python 3.
* tox.ini: remove the whitelist of tests run on Python 3, since the
  whole test suite now pass on Python 3!

Note: With the gate, the Python 3 gate became unstable: bug #1521756.
The bug was caused by eventlet and the eventlet bug has been fixed in
eventlet 0.18, released a few days ago.

Co-authored-by: Victor Stinner <vstinner@redhat.com>
Change-Id: I99e0a80df93d0304c33ce50859c92e62ccc71648
This commit is contained in:
Cyril Roelandt 2015-11-25 22:30:49 +01:00 committed by Victor Stinner
parent bdee4bbbed
commit e9fc06ccf3
4 changed files with 141 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
glance/api/v1/images.py
View File

@ -26,6 +26,7 @@ from oslo_log import log as logging
from oslo_utils import encodeutils from oslo_utils import encodeutils
from oslo_utils import excutils from oslo_utils import excutils
from oslo_utils import strutils from oslo_utils import strutils
import six
from webob.exc import HTTPBadRequest from webob.exc import HTTPBadRequest
from webob.exc import HTTPConflict from webob.exc import HTTPConflict
from webob.exc import HTTPForbidden from webob.exc import HTTPForbidden
@ -203,7 +204,7 @@ class Controller(controller.BaseController):
# If value is negative, allow unlimited number of properties # If value is negative, allow unlimited number of properties
return return
props = image_meta['properties'].keys() props = list(image_meta['properties'].keys())
# NOTE(ameade): If we are not removing existing properties, # NOTE(ameade): If we are not removing existing properties,
# take them in to account # take them in to account
@ -249,7 +250,7 @@ class Controller(controller.BaseController):
:param req: The WSGI/Webob Request object :param req: The WSGI/Webob Request object
""" """
if property_utils.is_property_protection_enabled(): if property_utils.is_property_protection_enabled():
for key in image_meta['properties'].keys(): for key in list(image_meta['properties'].keys()):
if (self.prop_enforcer.check_property_rules( if (self.prop_enforcer.check_property_rules(
key, 'read', req.context) is False): key, 'read', req.context) is False):
image_meta['properties'].pop(key) image_meta['properties'].pop(key)
@ -787,7 +788,7 @@ class Controller(controller.BaseController):
def _handle_source(self, req, image_id, image_meta, image_data): def _handle_source(self, req, image_id, image_meta, image_data):
copy_from = self._copy_from(req) copy_from = self._copy_from(req)
location = image_meta.get('location') location = image_meta.get('location')
sources = filter(lambda x: x, (copy_from, location, image_data)) sources = [obj for obj in (copy_from, location, image_data) if obj]
if len(sources) >= 2: if len(sources) >= 2:
msg = _("It's invalid to provide multiple image sources.") msg = _("It's invalid to provide multiple image sources.")
LOG.warn(msg) LOG.warn(msg)
@ -1234,7 +1235,7 @@ class ImageDeserializer(wsgi.JSONRequestDeserializer):
# gets the correct image data # gets the correct image data
request.body_file = data request.body_file = data
elif image_size > CONF.image_size_cap: elif image_size is not None and image_size > CONF.image_size_cap:
max_image_size = CONF.image_size_cap max_image_size = CONF.image_size_cap
msg = (_("Denying attempt to upload image larger than %d" msg = (_("Denying attempt to upload image larger than %d"
" bytes.") % max_image_size) " bytes.") % max_image_size)
@ -1259,11 +1260,16 @@ class ImageSerializer(wsgi.JSONResponseSerializer):
def _inject_location_header(self, response, image_meta): def _inject_location_header(self, response, image_meta):
location = self._get_image_location(image_meta) location = self._get_image_location(image_meta)
response.headers['Location'] = location.encode('utf-8') if six.PY2:
location = location.encode('utf-8')
response.headers['Location'] = location
def _inject_checksum_header(self, response, image_meta): def _inject_checksum_header(self, response, image_meta):
if image_meta['checksum'] is not None: if image_meta['checksum'] is not None:
response.headers['ETag'] = image_meta['checksum'].encode('utf-8') checksum = image_meta['checksum']
if six.PY2:
checksum = checksum.encode('utf-8')
response.headers['ETag'] = checksum
def _inject_image_meta_headers(self, response, image_meta): def _inject_image_meta_headers(self, response, image_meta):
""" """
@ -1280,7 +1286,10 @@ class ImageSerializer(wsgi.JSONResponseSerializer):
headers = utils.image_meta_to_http_headers(image_meta) headers = utils.image_meta_to_http_headers(image_meta)
for k, v in headers.items(): for k, v in headers.items():
response.headers[k.encode('utf-8')] = v.encode('utf-8') if six.PY3:
response.headers[str(k)] = str(v)
else:
response.headers[k.encode('utf-8')] = v.encode('utf-8')
def _get_image_location(self, image_meta): def _get_image_location(self, image_meta):
"""Build a relative url to reach the image defined by image_meta.""" """Build a relative url to reach the image defined by image_meta."""

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

@ -21,6 +21,7 @@ the Glance Registry API
from oslo_log import log as logging from oslo_log import log as logging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from oslo_utils import excutils from oslo_utils import excutils
import six
from glance.common.client import BaseClient from glance.common.client import BaseClient
from glance.common import crypt from glance.common import crypt
@ -113,13 +114,17 @@ class RegistryClient(BaseClient):
kwargs['headers'] = kwargs.get('headers', {}) kwargs['headers'] = kwargs.get('headers', {})
kwargs['headers'].update(self.identity_headers or {}) kwargs['headers'].update(self.identity_headers or {})
if self._passed_request_id: if self._passed_request_id:
kwargs['headers']['X-Openstack-Request-ID'] = ( request_id = self._passed_request_id
self._passed_request_id) if six.PY3 and isinstance(request_id, bytes):
request_id = request_id.decode('utf-8')
kwargs['headers']['X-Openstack-Request-ID'] = request_id
res = super(RegistryClient, self).do_request(method, res = super(RegistryClient, self).do_request(method,
action, action,
**kwargs) **kwargs)
status = res.status status = res.status
request_id = res.getheader('x-openstack-request-id') request_id = res.getheader('x-openstack-request-id')
if six.PY3 and isinstance(request_id, bytes):
request_id = request_id.decode('utf-8')
LOG.debug("Registry request %(method)s %(action)s HTTP %(status)s" LOG.debug("Registry request %(method)s %(action)s HTTP %(status)s"
" request id %(request_id)s", " request id %(request_id)s",
{'method': method, 'action': action, {'method': method, 'action': action,
@ -247,7 +252,8 @@ class RegistryClient(BaseClient):
headers = {} headers = {}
# Build up a body if can_share is specified # Build up a body if can_share is specified
if can_share is not None: if can_share is not None:
body = jsonutils.dumps(dict(member=dict(can_share=can_share))) body = jsonutils.dump_as_bytes(
dict(member=dict(can_share=can_share)))
headers['Content-Type'] = 'application/json' headers['Content-Type'] = 'application/json'
url = "/images/%s/members/%s" % (image_id, member_id) url = "/images/%s/members/%s" % (image_id, member_id)

218
glance/tests/unit/v1/test_api.py
View File

@ -115,7 +115,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
self.image_status = [] self.image_status = []
self.http_server_pid = None self.http_server_pid = None
self.addCleanup(self._cleanup_server) self.addCleanup(self._cleanup_server)
ret = test_utils.start_http_server("foo_image_id", "foo_image") ret = test_utils.start_http_server("foo_image_id", b"foo_image")
self.http_server_pid, self.http_port = ret self.http_server_pid, self.http_port = ret
def _cleanup_server(self): def _cleanup_server(self):
@ -234,7 +234,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.headers[k] = v req.headers[k] = v
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(400, res.status_int) self.assertEqual(400, res.status_int)
self.assertIn('Invalid value', res.body) self.assertIn(b'Invalid value', res.body)
def test_updating_imageid_after_creation(self): def test_updating_imageid_after_creation(self):
# Test incorrect/illegal id update # Test incorrect/illegal id update
@ -271,7 +271,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.headers['x-image-meta-min-disk'] = '-42' req.headers['x-image-meta-min-disk'] = '-42'
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(400, res.status_int) self.assertEqual(400, res.status_int)
self.assertIn('Invalid value', res.body) self.assertIn(b'Invalid value', res.body)
def test_invalid_min_disk_size_update(self): def test_invalid_min_disk_size_update(self):
fixture_headers = {'x-image-meta-disk-format': 'vhd', fixture_headers = {'x-image-meta-disk-format': 'vhd',
@ -307,7 +307,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.headers[k] = v req.headers[k] = v
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(400, res.status_int) self.assertEqual(400, res.status_int)
self.assertIn('Invalid value', res.body) self.assertIn(b'Invalid value', res.body)
def test_bad_min_ram_size_update(self): def test_bad_min_ram_size_update(self):
fixture_headers = {'x-image-meta-disk-format': 'vhd', fixture_headers = {'x-image-meta-disk-format': 'vhd',
@ -329,7 +329,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.headers['x-image-meta-min-ram'] = '-42' req.headers['x-image-meta-min-ram'] = '-42'
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(400, res.status_int) self.assertEqual(400, res.status_int)
self.assertIn('Invalid value', res.body) self.assertIn(b'Invalid value', res.body)
def test_invalid_min_ram_size_update(self): def test_invalid_min_ram_size_update(self):
fixture_headers = {'x-image-meta-disk-format': 'vhd', fixture_headers = {'x-image-meta-disk-format': 'vhd',
@ -368,7 +368,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(400, res.status_int) self.assertEqual(400, res.status_int)
self.assertIn('Invalid disk format', res.body) self.assertIn(b'Invalid disk format', res.body)
def test_configured_disk_format_good(self): def test_configured_disk_format_good(self):
self.config(disk_formats=['foo'], group="image_format") self.config(disk_formats=['foo'], group="image_format")
@ -407,7 +407,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(400, res.status_int) self.assertEqual(400, res.status_int)
self.assertIn('Invalid disk format', res.body) self.assertIn(b'Invalid disk format', res.body)
def test_configured_container_format_good(self): def test_configured_container_format_good(self):
self.config(container_formats=['foo'], group="image_format") self.config(container_formats=['foo'], group="image_format")
@ -447,7 +447,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(400, res.status_int) self.assertEqual(400, res.status_int)
self.assertIn('Invalid container format', res.body) self.assertIn(b'Invalid container format', res.body)
def test_container_and_disk_amazon_format_differs(self): def test_container_and_disk_amazon_format_differs(self):
fixture_headers = { fixture_headers = {
@ -463,10 +463,10 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.headers[k] = v req.headers[k] = v
res = req.get_response(self.api) res = req.get_response(self.api)
expected = ("Invalid mix of disk and container formats. " expected = (b"Invalid mix of disk and container formats. "
"When setting a disk or container format to one of " b"When setting a disk or container format to one of "
"'aki', 'ari', or 'ami', " b"'aki', 'ari', or 'ami', "
"the container and disk formats must match.") b"the container and disk formats must match.")
self.assertEqual(400, res.status_int) self.assertEqual(400, res.status_int)
self.assertIn(expected, res.body) self.assertIn(expected, res.body)
@ -488,7 +488,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
mocked_size.return_value = 0 mocked_size.return_value = 0
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(400, res.status_int) self.assertEqual(400, res.status_int)
self.assertIn('Container format is not specified', res.body) self.assertIn(b'Container format is not specified', res.body)
def test_create_with_location_no_disk_format(self): def test_create_with_location_no_disk_format(self):
fixture_headers = { fixture_headers = {
@ -508,7 +508,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
mocked_size.return_value = 0 mocked_size.return_value = 0
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(400, res.status_int) self.assertEqual(400, res.status_int)
self.assertIn('Disk format is not specified', res.body) self.assertIn(b'Disk format is not specified', res.body)
def test_create_with_empty_location(self): def test_create_with_empty_location(self):
fixture_headers = { fixture_headers = {
@ -568,7 +568,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(400, res.status_int) self.assertEqual(400, res.status_int)
self.assertIn('Required store bad is invalid', res.body) self.assertIn(b'Required store bad is invalid', res.body)
@mock.patch.object(glance.api.v1.images.Controller, '_external_source') @mock.patch.object(glance.api.v1.images.Controller, '_external_source')
@mock.patch.object(store, 'get_store_from_location') @mock.patch.object(store, 'get_store_from_location')
@ -595,7 +595,8 @@ class TestGlanceAPI(base.IsolatedUnitTest):
self.assertEqual(400, res.status_int) self.assertEqual(400, res.status_int)
self.assertEqual(1, mock_external_source.call_count) self.assertEqual(1, mock_external_source.call_count)
self.assertEqual(1, mock_get_store_from_location.call_count) self.assertEqual(1, mock_get_store_from_location.call_count)
self.assertIn('Store for scheme %s not found' % scheme, res.body) self.assertIn('Store for scheme %s not found' % scheme,
res.body.decode('utf-8'))
def test_create_with_location_unknown_scheme(self): def test_create_with_location_unknown_scheme(self):
fixture_headers = { fixture_headers = {
@ -613,7 +614,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(400, res.status_int) self.assertEqual(400, res.status_int)
self.assertIn('External sources are not supported', res.body) self.assertIn(b'External sources are not supported', res.body)
def test_create_with_location_bad_store_uri(self): def test_create_with_location_bad_store_uri(self):
fixture_headers = { fixture_headers = {
@ -631,7 +632,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(400, res.status_int) self.assertEqual(400, res.status_int)
self.assertIn('Invalid location', res.body) self.assertIn(b'Invalid location', res.body)
def test_create_image_with_too_many_properties(self): def test_create_image_with_too_many_properties(self):
self.config(image_property_quota=1) self.config(image_property_quota=1)
@ -661,7 +662,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(400, res.status_int) self.assertEqual(400, res.status_int)
self.assertIn('Invalid container format', res.body) self.assertIn(b'Invalid container format', res.body)
def test_bad_image_size(self): def test_bad_image_size(self):
fixture_headers = { fixture_headers = {
@ -681,9 +682,9 @@ class TestGlanceAPI(base.IsolatedUnitTest):
self.assertEqual(400, res.status_int) self.assertEqual(400, res.status_int)
self.assertIn(expected_substr, res.body) self.assertIn(expected_substr, res.body)
expected = "Cannot convert image size 'invalid' to an integer." expected = b"Cannot convert image size 'invalid' to an integer."
exec_bad_size_test('invalid', expected) exec_bad_size_test('invalid', expected)
expected = "Cannot be a negative value." expected = b"Cannot be a negative value."
exec_bad_size_test(-10, expected) exec_bad_size_test(-10, expected)
def test_bad_image_name(self): def test_bad_image_name(self):
@ -753,7 +754,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req = webob.Request.blank("/images") req = webob.Request.blank("/images")
req.method = 'POST' req.method = 'POST'
req.body = "chunk00000remainder" req.body = b"chunk00000remainder"
for k, v in six.iteritems(fixture_headers): for k, v in six.iteritems(fixture_headers):
req.headers[k] = v req.headers[k] = v
res = req.get_response(self.api) res = req.get_response(self.api)
@ -804,7 +805,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req = webob.Request.blank("/images") req = webob.Request.blank("/images")
req.method = 'POST' req.method = 'POST'
req.body = 'X' * (CONF.image_size_cap + 1) req.body = b'X' * (CONF.image_size_cap + 1)
for k, v in six.iteritems(fixture_headers): for k, v in six.iteritems(fixture_headers):
req.headers[k] = v req.headers[k] = v
@ -825,7 +826,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.method = 'POST' req.method = 'POST'
for k, v in six.iteritems(fixture_headers): for k, v in six.iteritems(fixture_headers):
req.headers[k] = v req.headers[k] = v
req.body = 'X' * (quota + 1) req.body = b'X' * (quota + 1)
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(413, res.status_int) self.assertEqual(413, res.status_int)
@ -842,7 +843,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req = webob.Request.blank("/images") req = webob.Request.blank("/images")
req.method = 'POST' req.method = 'POST'
req.body = 'X' * (quota + 1) req.body = b'X' * (quota + 1)
for k, v in six.iteritems(fixture_headers): for k, v in six.iteritems(fixture_headers):
req.headers[k] = v req.headers[k] = v
@ -861,7 +862,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req = webob.Request.blank("/images") req = webob.Request.blank("/images")
req.method = 'POST' req.method = 'POST'
req.body = 'X' * (quota + 1) req.body = b'X' * (quota + 1)
for k, v in six.iteritems(fixture_headers): for k, v in six.iteritems(fixture_headers):
req.headers[k] = v req.headers[k] = v
@ -872,7 +873,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req = webob.Request.blank("/images") req = webob.Request.blank("/images")
req.method = 'POST' req.method = 'POST'
req.body = 'X' * (quota - used_size) req.body = b'X' * (quota - used_size)
for k, v in six.iteritems(fixture_headers): for k, v in six.iteritems(fixture_headers):
req.headers[k] = v req.headers[k] = v
@ -956,7 +957,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.headers[k] = v req.headers[k] = v
req.headers['Content-Type'] = 'application/octet-stream' req.headers['Content-Type'] = 'application/octet-stream'
req.body = "XXXX" req.body = b"XXXX"
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(400, res.status_int) self.assertEqual(400, res.status_int)
@ -990,7 +991,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.headers[k] = v req.headers[k] = v
req.headers['Content-Type'] = 'application/octet-stream' req.headers['Content-Type'] = 'application/octet-stream'
req.body = "chunk00000remainder" req.body = b"chunk00000remainder"
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(400, res.status_int) self.assertEqual(400, res.status_int)
@ -1007,7 +1008,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.headers[k] = v req.headers[k] = v
req.headers['Content-Type'] = 'application/octet-stream' req.headers['Content-Type'] = 'application/octet-stream'
req.body = "chunk00000remainder" req.body = b"chunk00000remainder"
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(201, res.status_int) self.assertEqual(201, res.status_int)
@ -1046,7 +1047,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.headers[k] = v req.headers[k] = v
req.headers['Content-Type'] = 'application/octet-stream' req.headers['Content-Type'] = 'application/octet-stream'
req.body = "chunk00000remainder" req.body = b"chunk00000remainder"
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(403, res.status_int) self.assertEqual(403, res.status_int)
@ -1066,7 +1067,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.headers[k] = v req.headers[k] = v
req.headers['Content-Type'] = 'application/octet-stream' req.headers['Content-Type'] = 'application/octet-stream'
req.body = "chunk00000remainder" req.body = b"chunk00000remainder"
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(403, res.status_int) self.assertEqual(403, res.status_int)
@ -1086,7 +1087,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.headers[k] = v req.headers[k] = v
req.headers['Content-Type'] = 'application/octet-stream' req.headers['Content-Type'] = 'application/octet-stream'
req.body = "chunk00000remainder" req.body = b"chunk00000remainder"
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(201, res.status_int) self.assertEqual(201, res.status_int)
@ -1106,7 +1107,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.headers[k] = v req.headers[k] = v
req.headers['Content-Type'] = 'application/octet-stream' req.headers['Content-Type'] = 'application/octet-stream'
req.body = "chunk00000remainder" req.body = b"chunk00000remainder"
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(403, res.status_int) self.assertEqual(403, res.status_int)
@ -1184,7 +1185,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req = webob.Request.blank("/images") req = webob.Request.blank("/images")
req.headers['Content-Type'] = 'application/octet-stream' req.headers['Content-Type'] = 'application/octet-stream'
req.method = 'POST' req.method = 'POST'
req.body = "chunk00000remainder" req.body = b"chunk00000remainder"
for k, v in six.iteritems(fixture_headers): for k, v in six.iteritems(fixture_headers):
req.headers[k] = v req.headers[k] = v
res = req.get_response(self.api) res = req.get_response(self.api)
@ -1201,7 +1202,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req = webob.Request.blank("/images") req = webob.Request.blank("/images")
req.headers['Content-Type'] = 'application/octet-stream' req.headers['Content-Type'] = 'application/octet-stream'
req.method = 'POST' req.method = 'POST'
req.body = "chunk00000remainder" req.body = b"chunk00000remainder"
for k, v in six.iteritems(fixture_headers): for k, v in six.iteritems(fixture_headers):
req.headers[k] = v req.headers[k] = v
res = req.get_response(self.api) res = req.get_response(self.api)
@ -1378,7 +1379,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.headers['x-image-meta-location'] = 'http://' req.headers['x-image-meta-location'] = 'http://'
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(400, res.status_int) self.assertEqual(400, res.status_int)
self.assertIn('Invalid location', res.body) self.assertIn(b'Invalid location', res.body)
def test_update_data_upload_image_unauthorized(self): def test_update_data_upload_image_unauthorized(self):
rules = {"upload_image": '!', "modify_image": '@', rules = {"upload_image": '!', "modify_image": '@',
@ -1478,7 +1479,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.headers[k] = v req.headers[k] = v
req.headers['Content-Type'] = 'application/octet-stream' req.headers['Content-Type'] = 'application/octet-stream'
req.body = "chunk00000remainder" req.body = b"chunk00000remainder"
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(400, res.status_int) self.assertEqual(400, res.status_int)
@ -1517,7 +1518,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
for k, v in six.iteritems(fixture_headers): for k, v in six.iteritems(fixture_headers):
req.headers[k] = v req.headers[k] = v
req.headers['Content-Type'] = 'application/octet-stream' req.headers['Content-Type'] = 'application/octet-stream'
req.body = "chunk00000remainder" req.body = b"chunk00000remainder"
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(400, res.status_int) self.assertEqual(400, res.status_int)
@ -1547,11 +1548,11 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req = webob.Request.blank('/images/%s' % UUID2) req = webob.Request.blank('/images/%s' % UUID2)
req.method = 'PUT' req.method = 'PUT'
req.content_type = 'application/json' req.content_type = 'application/json'
req.body = jsonutils.dumps(dict(image=fixture)) req.body = jsonutils.dump_as_bytes(dict(image=fixture))
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(403, res.status_int) self.assertEqual(403, res.status_int)
self.assertIn('Forbidden to update deleted image', res.body) self.assertIn(b'Forbidden to update deleted image', res.body)
def test_delete_deleted_image(self): def test_delete_deleted_image(self):
"""Tests that exception raised trying to delete a deleted image""" """Tests that exception raised trying to delete a deleted image"""
@ -1572,7 +1573,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(404, res.status_int) self.assertEqual(404, res.status_int)
msg = "Image %s not found." % UUID2 msg = "Image %s not found." % UUID2
self.assertIn(msg, res.body) self.assertIn(msg, res.body.decode())
# Verify the status is still 'deleted' # Verify the status is still 'deleted'
req = webob.Request.blank("/images/%s" % UUID2) req = webob.Request.blank("/images/%s" % UUID2)
@ -1596,7 +1597,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.method = 'DELETE' req.method = 'DELETE'
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(403, res.status_int) self.assertEqual(403, res.status_int)
self.assertIn('Forbidden to delete image', res.body) self.assertIn(b'Forbidden to delete image', res.body)
# check image metadata is still there with active state # check image metadata is still there with active state
req = webob.Request.blank("/images/%s" % UUID2) req = webob.Request.blank("/images/%s" % UUID2)
@ -1629,7 +1630,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.method = 'DELETE' req.method = 'DELETE'
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(403, res.status_int) self.assertEqual(403, res.status_int)
self.assertIn('Forbidden to delete a pending_delete image', res.body) self.assertIn(b'Forbidden to delete a pending_delete image', res.body)
# Verify the status is still 'pending_delete' # Verify the status is still 'pending_delete'
req = webob.Request.blank("/images/%s" % UUID2) req = webob.Request.blank("/images/%s" % UUID2)
@ -1739,7 +1740,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req = webob.Request.blank("/images/%s" % image_id) req = webob.Request.blank("/images/%s" % image_id)
req.method = 'PUT' req.method = 'PUT'
req.headers['Content-Type'] = 'application/octet-stream' req.headers['Content-Type'] = 'application/octet-stream'
req.body = "chunk00000remainder" req.body = b"chunk00000remainder"
with mock.patch.object( with mock.patch.object(
upload_utils, 'initiate_deletion') as mock_init_del: upload_utils, 'initiate_deletion') as mock_init_del:
@ -1816,7 +1817,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.method = 'PUT' req.method = 'PUT'
req.headers['Content-Type'] = 'application/octet-stream' req.headers['Content-Type'] = 'application/octet-stream'
req.headers['x-image-meta-property-key2'] = 'value2' req.headers['x-image-meta-property-key2'] = 'value2'
req.body = "chunk00000remainder" req.body = b"chunk00000remainder"
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(200, res.status_int) self.assertEqual(200, res.status_int)
@ -1865,7 +1866,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req = webob.Request.blank("/images/%s" % image_id) req = webob.Request.blank("/images/%s" % image_id)
req.method = 'PUT' req.method = 'PUT'
req.headers['Content-Type'] = 'application/octet-stream' req.headers['Content-Type'] = 'application/octet-stream'
req.body = "chunk00000remainder" req.body = b"chunk00000remainder"
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(410, res.status_int) self.assertEqual(410, res.status_int)
self._verify_image_status(image_id, 'killed') self._verify_image_status(image_id, 'killed')
@ -1921,7 +1922,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.method = 'PUT' req.method = 'PUT'
req.headers['Content-Type'] = 'application/octet-stream' req.headers['Content-Type'] = 'application/octet-stream'
req.headers['x-image-meta-property-key2'] = 'value2' req.headers['x-image-meta-property-key2'] = 'value2'
req.body = "chunk00000remainder" req.body = b"chunk00000remainder"
res = req.get_response(self.api) res = req.get_response(self.api)
# We expect 500 since an exception occurred during upload. # We expect 500 since an exception occurred during upload.
self.assertEqual(500, res.status_int) self.assertEqual(500, res.status_int)
@ -2023,7 +2024,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
orig_update_image_metadata = registry.update_image_metadata orig_update_image_metadata = registry.update_image_metadata
data = "somedata" data = b"somedata"
def mock_update_image_metadata(*args, **kwargs): def mock_update_image_metadata(*args, **kwargs):
@ -2085,7 +2086,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.headers[k] = v req.headers[k] = v
req.headers['Content-Type'] = 'application/octet-stream' req.headers['Content-Type'] = 'application/octet-stream'
req.body = "chunk00000remainder" req.body = b"chunk00000remainder"
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(201, res.status_int) self.assertEqual(201, res.status_int)
res_body = jsonutils.loads(res.body)['image'] res_body = jsonutils.loads(res.body)['image']
@ -2194,7 +2195,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req = webob.Request.blank("/images/%s" % UUID2) req = webob.Request.blank("/images/%s" % UUID2)
req.method = 'PUT' req.method = 'PUT'
req.body = 'X' * (CONF.image_size_cap + 1) req.body = b'X' * (CONF.image_size_cap + 1)
for k, v in six.iteritems(fixture_headers): for k, v in six.iteritems(fixture_headers):
req.headers[k] = v req.headers[k] = v
@ -2232,7 +2233,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req = webob.Request.blank("images/%s" % _gen_uuid) req = webob.Request.blank("images/%s" % _gen_uuid)
req.method = 'PUT' req.method = 'PUT'
req.body = 'test' req.body = b'test'
req.headers['x-image-meta-name'] = 'test' req.headers['x-image-meta-name'] = 'test'
req.headers['x-image-meta-container_format'] = 'ami' req.headers['x-image-meta-container_format'] = 'ami'
req.headers['x-image-meta-disk_format'] = 'ami' req.headers['x-image-meta-disk_format'] = 'ami'
@ -2691,7 +2692,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
'x-image-meta-disk-format': 'vhd', 'x-image-meta-disk-format': 'vhd',
'x-image-meta-container-format': 'ovf', 'x-image-meta-container-format': 'ovf',
'x-image-meta-name': 'fake image #3'} 'x-image-meta-name': 'fake image #3'}
image_contents = "chunk00000remainder" image_contents = b"chunk00000remainder"
image_checksum = hashlib.md5(image_contents).hexdigest() image_checksum = hashlib.md5(image_contents).hexdigest()
req = webob.Request.blank("/images") req = webob.Request.blank("/images")
@ -2715,7 +2716,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
'x-image-meta-disk-format': 'vhd', 'x-image-meta-disk-format': 'vhd',
'x-image-meta-container-format': 'ovf', 'x-image-meta-container-format': 'ovf',
'x-image-meta-name': 'fake image #3'} 'x-image-meta-name': 'fake image #3'}
image_contents = "chunk00000remainder" image_contents = b"chunk00000remainder"
image_checksum = hashlib.md5(image_contents).hexdigest() image_checksum = hashlib.md5(image_contents).hexdigest()
req = webob.Request.blank("/images") req = webob.Request.blank("/images")
@ -2747,8 +2748,8 @@ class TestGlanceAPI(base.IsolatedUnitTest):
def test_bad_checksum_prevents_image_creation(self): def test_bad_checksum_prevents_image_creation(self):
"""Test that the image contents are checksummed properly""" """Test that the image contents are checksummed properly"""
image_contents = "chunk00000remainder" image_contents = b"chunk00000remainder"
bad_checksum = hashlib.md5("invalid").hexdigest() bad_checksum = hashlib.md5(b"invalid").hexdigest()
fixture_headers = {'x-image-meta-store': 'file', fixture_headers = {'x-image-meta-store': 'file',
'x-image-meta-disk-format': 'vhd', 'x-image-meta-disk-format': 'vhd',
'x-image-meta-container-format': 'ovf', 'x-image-meta-container-format': 'ovf',
@ -2801,7 +2802,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
self.assertEqual(200, res.status_int) self.assertEqual(200, res.status_int)
self.assertFalse(res.location) self.assertFalse(res.location)
self.assertEqual('application/octet-stream', res.content_type) self.assertEqual('application/octet-stream', res.content_type)
self.assertEqual('chunk00000remainder', res.body) self.assertEqual(b'chunk00000remainder', res.body)
def test_show_non_exists_image(self): def test_show_non_exists_image(self):
req = webob.Request.blank("/images/%s" % _gen_uuid()) req = webob.Request.blank("/images/%s" % _gen_uuid())
@ -2885,7 +2886,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(200, res.status_int) self.assertEqual(200, res.status_int)
self.assertFalse(res.location) self.assertFalse(res.location)
self.assertEqual('', res.body) self.assertEqual(b'', res.body)
req = webob.Request.blank("/images/%s" % UUID2) req = webob.Request.blank("/images/%s" % UUID2)
req.method = 'GET' req.method = 'GET'
@ -3137,7 +3138,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req = webob.Request.blank('/images/%s/members' % UUID2) req = webob.Request.blank('/images/%s/members' % UUID2)
req.method = 'PUT' req.method = 'PUT'
req.content_type = 'application/json' req.content_type = 'application/json'
req.body = jsonutils.dumps(dict(image_memberships=fixture)) req.body = jsonutils.dump_as_bytes(dict(image_memberships=fixture))
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(401, res.status_int) self.assertEqual(401, res.status_int)
@ -3167,7 +3168,8 @@ class TestGlanceAPI(base.IsolatedUnitTest):
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(403, res.status_int) self.assertEqual(403, res.status_int)
prop = k[len('x-image-meta-'):] prop = k[len('x-image-meta-'):]
self.assertNotEqual(-1, res.body.find( body = res.body.decode('utf-8')
self.assertNotEqual(-1, body.find(
"Forbidden to modify '%s' of active image" % prop)) "Forbidden to modify '%s' of active image" % prop))
req = webob.Request.blank('/images/%s' % UUID2) req = webob.Request.blank('/images/%s' % UUID2)
@ -3201,7 +3203,8 @@ class TestGlanceAPI(base.IsolatedUnitTest):
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(403, res.status_int) self.assertEqual(403, res.status_int)
prop = k[len('x-image-meta-'):] prop = k[len('x-image-meta-'):]
self.assertNotEqual(-1, res.body.find( body = res.body.decode('utf-8')
self.assertNotEqual(-1, body.find(
"Forbidden to modify '%s' of deactivated image" % prop)) "Forbidden to modify '%s' of deactivated image" % prop))
req = webob.Request.blank('/images/%s' % UUID3) req = webob.Request.blank('/images/%s' % UUID3)
@ -3281,7 +3284,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req = webob.Request.blank('/images/%s/members' % _gen_uuid()) req = webob.Request.blank('/images/%s/members' % _gen_uuid())
req.method = 'PUT' req.method = 'PUT'
req.content_type = 'application/json' req.content_type = 'application/json'
req.body = jsonutils.dumps(dict(image_memberships=fixture)) req.body = jsonutils.dump_as_bytes(dict(image_memberships=fixture))
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(404, res.status_int) self.assertEqual(404, res.status_int)
@ -3298,7 +3301,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req = webob.Request.blank('/images/%s/members' % UUID2) req = webob.Request.blank('/images/%s/members' % UUID2)
req.method = 'PUT' req.method = 'PUT'
req.content_type = 'application/json' req.content_type = 'application/json'
req.body = jsonutils.dumps(dict(image_memberships=fixture)) req.body = jsonutils.dump_as_bytes(dict(image_memberships=fixture))
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(400, res.status_int) self.assertEqual(400, res.status_int)
@ -3316,7 +3319,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req = webob.Request.blank('/images/%s/members' % UUID2) req = webob.Request.blank('/images/%s/members' % UUID2)
req.method = 'PUT' req.method = 'PUT'
req.content_type = 'application/json' req.content_type = 'application/json'
req.body = jsonutils.dumps(dict(memberships=fixture)) req.body = jsonutils.dump_as_bytes(dict(memberships=fixture))
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(204, res.status_int) self.assertEqual(204, res.status_int)
@ -3330,7 +3333,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req = webob.Request.blank('/images/%s/members' % UUID1) req = webob.Request.blank('/images/%s/members' % UUID1)
req.method = 'PUT' req.method = 'PUT'
req.content_type = 'application/json' req.content_type = 'application/json'
req.body = jsonutils.dumps(dict(memberships=fixture)) req.body = jsonutils.dump_as_bytes(dict(memberships=fixture))
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(webob.exc.HTTPForbidden.code, res.status_int) self.assertEqual(webob.exc.HTTPForbidden.code, res.status_int)
@ -3345,7 +3348,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req = webob.Request.blank('/images/%s/members' % UUID1) req = webob.Request.blank('/images/%s/members' % UUID1)
req.method = 'PUT' req.method = 'PUT'
req.content_type = 'application/json' req.content_type = 'application/json'
req.body = jsonutils.dumps(dict(memberships=fixture)) req.body = jsonutils.dump_as_bytes(dict(memberships=fixture))
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(webob.exc.HTTPNoContent.code, res.status_int) self.assertEqual(webob.exc.HTTPNoContent.code, res.status_int)
@ -3387,7 +3390,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
test_router, is_admin=True) test_router, is_admin=True)
req = webob.Request.blank('/images/%s/members/pattieblack' % UUID2) req = webob.Request.blank('/images/%s/members/pattieblack' % UUID2)
req.method = 'PUT' req.method = 'PUT'
req.body = jsonutils.dumps(dict(member=fixture)) req.body = jsonutils.dump_as_bytes(dict(member=fixture))
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(204, res.status_int) self.assertEqual(204, res.status_int)
@ -3449,8 +3452,8 @@ class TestGlanceAPI(base.IsolatedUnitTest):
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(webob.exc.HTTPNotFound.code, res.status_int) self.assertEqual(webob.exc.HTTPNotFound.code, res.status_int)
self.assertIn( self.assertIn('Image with identifier %s has been deleted.' % UUID2,
'Image with identifier %s has been deleted.' % UUID2, res.body) res.body.decode())
def test_delete_member_of_deleted_image_raises_404(self): def test_delete_member_of_deleted_image_raises_404(self):
""" """
@ -3468,8 +3471,8 @@ class TestGlanceAPI(base.IsolatedUnitTest):
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(webob.exc.HTTPNotFound.code, res.status_int) self.assertEqual(webob.exc.HTTPNotFound.code, res.status_int)
self.assertIn( self.assertIn('Image with identifier %s has been deleted.' % UUID2,
'Image with identifier %s has been deleted.' % UUID2, res.body) res.body.decode())
def test_update_members_of_deleted_image_raises_404(self): def test_update_members_of_deleted_image_raises_404(self):
""" """
@ -3492,11 +3495,12 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req = webob.Request.blank('/images/%s/members' % UUID2) req = webob.Request.blank('/images/%s/members' % UUID2)
req.method = 'PUT' req.method = 'PUT'
req.content_type = 'application/json' req.content_type = 'application/json'
req.body = jsonutils.dumps(dict(memberships=fixture)) req.body = jsonutils.dump_as_bytes(dict(memberships=fixture))
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(webob.exc.HTTPNotFound.code, res.status_int) self.assertEqual(webob.exc.HTTPNotFound.code, res.status_int)
body = res.body.decode('utf-8')
self.assertIn( self.assertIn(
'Image with identifier %s has been deleted.' % UUID2, res.body) 'Image with identifier %s has been deleted.' % UUID2, body)
def test_replace_members_of_image(self): def test_replace_members_of_image(self):
test_router = router.API(self.mapper) test_router = router.API(self.mapper)
@ -3505,7 +3509,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
fixture = [{'member_id': 'pattieblack', 'can_share': 'false'}] fixture = [{'member_id': 'pattieblack', 'can_share': 'false'}]
req = webob.Request.blank('/images/%s/members' % UUID2) req = webob.Request.blank('/images/%s/members' % UUID2)
req.method = 'PUT' req.method = 'PUT'
req.body = jsonutils.dumps(dict(memberships=fixture)) req.body = jsonutils.dump_as_bytes(dict(memberships=fixture))
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(204, res.status_int) self.assertEqual(204, res.status_int)
@ -3527,7 +3531,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
fixture = [{'member_id': 'baz', 'can_share': False}] fixture = [{'member_id': 'baz', 'can_share': False}]
req = webob.Request.blank('/images/%s/members' % UUID2) req = webob.Request.blank('/images/%s/members' % UUID2)
req.method = 'PUT' req.method = 'PUT'
req.body = jsonutils.dumps(dict(memberships=fixture)) req.body = jsonutils.dump_as_bytes(dict(memberships=fixture))
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(204, res.status_int) self.assertEqual(204, res.status_int)
@ -3544,7 +3548,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
{'member_id': 'foo2', 'can_share': False}] {'member_id': 'foo2', 'can_share': False}]
req = webob.Request.blank('/images/%s/members' % UUID2) req = webob.Request.blank('/images/%s/members' % UUID2)
req.method = 'PUT' req.method = 'PUT'
req.body = jsonutils.dumps(dict(memberships=fixture)) req.body = jsonutils.dump_as_bytes(dict(memberships=fixture))
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(413, res.status_int) self.assertEqual(413, res.status_int)
@ -3567,7 +3571,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
{'member_id': 'foo2', 'can_share': False}] {'member_id': 'foo2', 'can_share': False}]
req = webob.Request.blank('/images/%s/members' % UUID2) req = webob.Request.blank('/images/%s/members' % UUID2)
req.method = 'PUT' req.method = 'PUT'
req.body = jsonutils.dumps(dict(memberships=fixture)) req.body = jsonutils.dump_as_bytes(dict(memberships=fixture))
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(204, res.status_int) self.assertEqual(204, res.status_int)
@ -3595,8 +3599,8 @@ class TestGlanceAPI(base.IsolatedUnitTest):
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(webob.exc.HTTPNotFound.code, res.status_int) self.assertEqual(webob.exc.HTTPNotFound.code, res.status_int)
self.assertIn( self.assertIn('Image with identifier %s has been deleted.' % UUID2,
'Image with identifier %s has been deleted.' % UUID2, res.body) res.body.decode())
def test_delete_member(self): def test_delete_member(self):
""" """
@ -3647,7 +3651,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req = webob.Request.blank(test_uri % UUID2) req = webob.Request.blank(test_uri % UUID2)
req.method = 'PUT' req.method = 'PUT'
req.content_type = 'application/json' req.content_type = 'application/json'
req.body = jsonutils.dumps(dict(member=fixture)) req.body = jsonutils.dump_as_bytes(dict(member=fixture))
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(204, res.status_int) self.assertEqual(204, res.status_int)
@ -3659,7 +3663,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.content_type = 'application/json' req.content_type = 'application/json'
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEqual(404, res.status_int) self.assertEqual(404, res.status_int)
self.assertIn('Forbidden', res.body) self.assertIn(b'Forbidden', res.body)
def test_delete_member_allowed_by_policy(self): def test_delete_member_allowed_by_policy(self):
rules = {"delete_member": '@', "modify_member": '@'} rules = {"delete_member": '@', "modify_member": '@'}
@ -3701,7 +3705,7 @@ class TestImageSerializer(base.IsolatedUnitTest):
self.serializer = glance.api.v1.images.ImageSerializer() self.serializer = glance.api.v1.images.ImageSerializer()
def image_iter(): def image_iter():
for x in ['chunk', '678911234', '56789']: for x in [b'chunk', b'678911234', b'56789']:
yield x yield x
self.FIXTURE = { self.FIXTURE = {
@ -3765,29 +3769,37 @@ class TestImageSerializer(base.IsolatedUnitTest):
} }
} }
} }
exp_headers = {'x-image-meta-id': UUID2.encode('utf-8'), exp_headers = {'x-image-meta-id': UUID2,
'x-image-meta-location': 'file:///tmp/glance-tests/2', 'x-image-meta-location': 'file:///tmp/glance-tests/2',
'ETag': '06ff575a2856444fbe93100157ed74ab92eb7eff', 'ETag': '06ff575a2856444fbe93100157ed74ab92eb7eff',
'x-image-meta-size': '19', # str, not int 'x-image-meta-size': '19', # str, not int
'x-image-meta-name': 'fake image #2 with utf-8 éàè', 'x-image-meta-name': 'fake image #2 with utf-8 éàè',
'x-image-meta-property-prop_éé': 'ça marche', 'x-image-meta-property-prop_éé': 'ça marche',
'x-image-meta-property-prop_çé': u'çé'.encode('utf-8')} 'x-image-meta-property-prop_çé': 'çé'}
req = webob.Request.blank("/images/%s" % UUID2) req = webob.Request.blank("/images/%s" % UUID2)
req.method = 'HEAD' req.method = 'HEAD'
req.remote_addr = "1.2.3.4" req.remote_addr = "1.2.3.4"
req.context = self.context req.context = self.context
response = webob.Response(request=req) response = webob.Response(request=req)
self.serializer.meta(response, FIXTURE) self.serializer.meta(response, FIXTURE)
self.assertNotEqual(type(FIXTURE['image_meta']['name']), if six.PY2:
type(response.headers['x-image-meta-name'])) self.assertNotEqual(type(FIXTURE['image_meta']['name']),
self.assertEqual(FIXTURE['image_meta']['name'], type(response.headers['x-image-meta-name']))
response.headers['x-image-meta-name'].decode('utf-8')) if six.PY3:
self.assertEqual(FIXTURE['image_meta']['name'],
response.headers['x-image-meta-name'])
else:
self.assertEqual(
FIXTURE['image_meta']['name'],
response.headers['x-image-meta-name'].decode('utf-8'))
for key, value in six.iteritems(exp_headers): for key, value in six.iteritems(exp_headers):
self.assertEqual(value, response.headers[key]) self.assertEqual(value, response.headers[key])
FIXTURE['image_meta']['properties'][u'prop_bad'] = 'çé' if six.PY2:
self.assertRaises(UnicodeDecodeError, FIXTURE['image_meta']['properties'][u'prop_bad'] = 'çé'
self.serializer.meta, response, FIXTURE) self.assertRaises(UnicodeDecodeError,
self.serializer.meta, response, FIXTURE)
def test_show(self): def test_show(self):
exp_headers = {'x-image-meta-id': UUID2, exp_headers = {'x-image-meta-id': UUID2,
@ -3802,7 +3814,7 @@ class TestImageSerializer(base.IsolatedUnitTest):
for key, value in six.iteritems(exp_headers): for key, value in six.iteritems(exp_headers):
self.assertEqual(value, response.headers[key]) self.assertEqual(value, response.headers[key])
self.assertEqual('chunk67891123456789', response.body) self.assertEqual(b'chunk67891123456789', response.body)
def test_show_notify(self): def test_show_notify(self):
"""Make sure an eventlet posthook for notify_image_sent is added.""" """Make sure an eventlet posthook for notify_image_sent is added."""
@ -3999,7 +4011,7 @@ class TestAPIProtectedProps(base.IsolatedUnitTest):
output = another_request.get_response(self.api) output = another_request.get_response(self.api)
self.assertEqual(webob.exc.HTTPForbidden.code, output.status_int) self.assertEqual(webob.exc.HTTPForbidden.code, output.status_int)
self.assertIn("Property '%s' is protected" % self.assertIn("Property '%s' is protected" %
"x_owner_foo", output.body) "x_owner_foo", output.body.decode())
def test_prop_protection_with_show_and_permitted_role(self): def test_prop_protection_with_show_and_permitted_role(self):
""" """
@ -4032,7 +4044,7 @@ class TestAPIProtectedProps(base.IsolatedUnitTest):
another_request.headers[k] = v another_request.headers[k] = v
output = another_request.get_response(self.api) output = another_request.get_response(self.api)
self.assertEqual(200, output.status_int) self.assertEqual(200, output.status_int)
self.assertEqual('', output.body) self.assertEqual(b'', output.body)
self.assertNotIn('x-image-meta-property-x_owner_foo', output.headers) self.assertNotIn('x-image-meta-property-x_owner_foo', output.headers)
def test_prop_protection_with_get_and_permitted_role(self): def test_prop_protection_with_get_and_permitted_role(self):
@ -4066,7 +4078,7 @@ class TestAPIProtectedProps(base.IsolatedUnitTest):
another_request.headers[k] = v another_request.headers[k] = v
output = another_request.get_response(self.api) output = another_request.get_response(self.api)
self.assertEqual(200, output.status_int) self.assertEqual(200, output.status_int)
self.assertEqual('', output.body) self.assertEqual(b'', output.body)
self.assertNotIn('x-image-meta-property-x_owner_foo', output.headers) self.assertNotIn('x-image-meta-property-x_owner_foo', output.headers)
def test_prop_protection_with_detail_and_permitted_role(self): def test_prop_protection_with_detail_and_permitted_role(self):
@ -4192,7 +4204,7 @@ class TestAPIProtectedProps(base.IsolatedUnitTest):
output = another_request.get_response(self.api) output = another_request.get_response(self.api)
self.assertEqual(webob.exc.HTTPForbidden.code, output.status_int) self.assertEqual(webob.exc.HTTPForbidden.code, output.status_int)
self.assertIn("Property '%s' is protected" % self.assertIn("Property '%s' is protected" %
"x_owner_foo", output.body) "x_owner_foo", output.body.decode())
def test_prop_protection_with_update_and_unpermitted_policy(self): def test_prop_protection_with_update_and_unpermitted_policy(self):
""" """
@ -4211,7 +4223,7 @@ class TestAPIProtectedProps(base.IsolatedUnitTest):
output = another_request.get_response(self.api) output = another_request.get_response(self.api)
self.assertEqual(webob.exc.HTTPForbidden.code, output.status_int) self.assertEqual(webob.exc.HTTPForbidden.code, output.status_int)
self.assertIn("Property '%s' is protected" % self.assertIn("Property '%s' is protected" %
"x_owner_foo", output.body) "x_owner_foo", output.body.decode())
def test_prop_protection_update_without_read(self): def test_prop_protection_update_without_read(self):
""" """
@ -4228,7 +4240,7 @@ class TestAPIProtectedProps(base.IsolatedUnitTest):
output = another_request.get_response(self.api) output = another_request.get_response(self.api)
self.assertEqual(webob.exc.HTTPForbidden.code, output.status_int) self.assertEqual(webob.exc.HTTPForbidden.code, output.status_int)
self.assertIn("Property '%s' is protected" % self.assertIn("Property '%s' is protected" %
"spl_update_only_prop", output.body) "spl_update_only_prop", output.body.decode())
def test_prop_protection_update_noop(self): def test_prop_protection_update_noop(self):
""" """
@ -4307,7 +4319,7 @@ class TestAPIProtectedProps(base.IsolatedUnitTest):
another_request.headers[k] = v another_request.headers[k] = v
output = another_request.get_response(self.api) output = another_request.get_response(self.api)
self.assertEqual(200, output.status_int) self.assertEqual(200, output.status_int)
self.assertEqual('', output.body) self.assertEqual(b'', output.body)
self.assertEqual('bar', self.assertEqual('bar',
output.headers['x-image-meta-property-x_owner_foo']) output.headers['x-image-meta-property-x_owner_foo'])
@ -4327,7 +4339,7 @@ class TestAPIProtectedProps(base.IsolatedUnitTest):
output = another_request.get_response(self.api) output = another_request.get_response(self.api)
self.assertEqual(403, output.status_int) self.assertEqual(403, output.status_int)
self.assertIn("Property '%s' is protected" % self.assertIn("Property '%s' is protected" %
"spl_update_prop", output.body) "spl_update_prop", output.body.decode())
another_request = unit_test_utils.get_fake_request( another_request = unit_test_utils.get_fake_request(
method='HEAD', path='/images/%s' % image_id) method='HEAD', path='/images/%s' % image_id)
@ -4336,7 +4348,7 @@ class TestAPIProtectedProps(base.IsolatedUnitTest):
another_request.headers[k] = v another_request.headers[k] = v
output = another_request.get_response(self.api) output = another_request.get_response(self.api)
self.assertEqual(200, output.status_int) self.assertEqual(200, output.status_int)
self.assertEqual('', output.body) self.assertEqual(b'', output.body)
self.assertEqual( self.assertEqual(
'foo', output.headers['x-image-meta-property-spl_update_prop']) 'foo', output.headers['x-image-meta-property-spl_update_prop'])
@ -4489,7 +4501,7 @@ class TestAPIProtectedProps(base.IsolatedUnitTest):
another_request.headers[k] = v another_request.headers[k] = v
output = another_request.get_response(self.api) output = another_request.get_response(self.api)
self.assertEqual(200, output.status_int) self.assertEqual(200, output.status_int)
self.assertEqual('', output.body) self.assertEqual(b'', output.body)
self.assertEqual( self.assertEqual(
'1', output.headers['x-image-meta-property-x_case_insensitive']) '1', output.headers['x-image-meta-property-x_case_insensitive'])
@ -4559,7 +4571,7 @@ class TestAPIProtectedProps(base.IsolatedUnitTest):
another_request.headers[k] = v another_request.headers[k] = v
output = another_request.get_response(self.api) output = another_request.get_response(self.api)
self.assertEqual(200, output.status_int) self.assertEqual(200, output.status_int)
self.assertEqual('', output.body) self.assertEqual(b'', output.body)
self.assertEqual( self.assertEqual(
'1', output.headers['x-image-meta-property-x_all_permitted']) '1', output.headers['x-image-meta-property-x_all_permitted'])

68
tox.ini
View File

@ -21,73 +21,7 @@ install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstac
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
[testenv:py34] [testenv:py34]
commands = commands = lockutils-wrapper python setup.py testr --slowest --testr-args='glance.tests.unit'
python -m testtools.run \
glance.tests.unit.api.middleware.test_cache_manage \
glance.tests.unit.api.test_cmd \
glance.tests.unit.api.test_cmd_cache_manage \
glance.tests.unit.api.test_common \
glance.tests.unit.api.test_property_protections \
glance.tests.unit.async.flows.test_convert \
glance.tests.unit.async.flows.test_import \
glance.tests.unit.async.flows.test_introspect \
glance.tests.unit.async.test_async \
glance.tests.unit.async.test_taskflow_executor \
glance.tests.unit.common.scripts.image_import.test_main \
glance.tests.unit.common.scripts.test_scripts_utils \
glance.tests.unit.common.test_client \
glance.tests.unit.common.test_config \
glance.tests.unit.common.test_exception \
glance.tests.unit.common.test_location_strategy \
glance.tests.unit.common.test_property_utils \
glance.tests.unit.common.test_rpc \
glance.tests.unit.common.test_scripts \
glance.tests.unit.common.test_semver \
glance.tests.unit.common.test_signature_utils \
glance.tests.unit.common.test_swift_store_utils \
glance.tests.unit.common.test_utils \
glance.tests.unit.common.test_wsgi \
glance.tests.unit.common.test_wsgi_ipv6 \
glance.tests.unit.test_artifact_type_definition_framework \
glance.tests.unit.test_artifacts_plugin_loader \
glance.tests.unit.test_auth \
glance.tests.unit.test_cache_middleware \
glance.tests.unit.test_cached_images \
glance.tests.unit.test_context \
glance.tests.unit.test_context_middleware \
glance.tests.unit.test_db \
glance.tests.unit.test_db_metadef \
glance.tests.unit.test_domain \
glance.tests.unit.test_domain_proxy \
glance.tests.unit.test_glance_replicator \
glance.tests.unit.test_image_cache \
glance.tests.unit.test_image_cache_client \
glance.tests.unit.test_jsonpatchmixin \
glance.tests.unit.test_manage \
glance.tests.unit.test_migrations \
glance.tests.unit.test_misc \
glance.tests.unit.test_notifier \
glance.tests.unit.test_policy \
glance.tests.unit.test_quota \
glance.tests.unit.test_schema \
glance.tests.unit.test_scrubber \
glance.tests.unit.test_store_artifact \
glance.tests.unit.test_store_image \
glance.tests.unit.test_store_location \
glance.tests.unit.test_versions \
glance.tests.unit.v1.test_registry_api \
glance.tests.unit.v1.test_registry_client \
glance.tests.unit.v1.test_upload_utils \
glance.tests.unit.v2.test_image_actions_resource \
glance.tests.unit.v2.test_image_data_resource \
glance.tests.unit.v2.test_image_members_resource \
glance.tests.unit.v2.test_image_tags_resource \
glance.tests.unit.v2.test_images_resource \
glance.tests.unit.v2.test_metadef_resources \
glance.tests.unit.v2.test_registry_api \
glance.tests.unit.v2.test_registry_client \
glance.tests.unit.v2.test_schemas_resource \
glance.tests.unit.v2.test_tasks_resource
[testenv:py34-constraints] [testenv:py34-constraints]
install_command = {[testenv:common-constraints]install_command} install_command = {[testenv:common-constraints]install_command}