openstack
/
glance
Code Issues Proposed changes

Python 3: fix glance.tests.functional.v1.test_misc 

Change-Id: I7b552dd0b942363c3e049d25dd20d5166c727d7a
This commit is contained in:
Cyril Roelandt 2016-11-25 18:13:07 +01:00
parent 1d5dd0641a
commit 37a6f30aa0
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glance/tests/functional/v1/test_misc.py
View File

@ -52,7 +52,7 @@ class TestMiscellaneous(functional.FunctionalTest):
# 1. POST /images with public image named Image1
# attribute and no custom properties. Verify a 200 OK is returned
image_data = "*" * FIVE_KB
image_data = b"*" * FIVE_KB
headers = minimal_headers('Image1')
path = "http://%s:%d/v1/images" % ("127.0.0.1", self.api_port)
http = httplib2.Http()
@ -108,14 +108,14 @@ class TestMiscellaneous(functional.FunctionalTest):
http = httplib2.Http()
response, content = http.request(path, 'GET')
self.assertEqual(http_client.OK, response.status)
self.assertEqual('{"images": []}', content)
self.assertEqual(b'{"images": []}', content)
headers = {'Content-Type': 'application/octet-stream',
'X-Image-Meta-Name': 'ImageName',
'X-Image-Meta-Disk-Format': 'Invalid', }
ignored, content = http.request(path, 'POST', headers=headers)
self.assertIn('Invalid disk format', content,
self.assertIn(b'Invalid disk format', content,
"Could not find 'Invalid disk format' "
"in output: %s" % content)

1
tox.ini
View File

@ -49,6 +49,7 @@ commands =
glance.tests.functional.db.test_simple \
glance.tests.functional.db.test_sqlalchemy \
glance.tests.functional.db.test_rpc_endpoint \
glance.tests.functional.v1.test_misc \
glance.tests.functional.v1.test_multiprocessing \
glance.tests.functional.v2.test_metadef_objects \
glance.tests.functional.v2.test_schemas \