openstack
/
glance
Code Issues Proposed changes

Merge "Fix order of arguments in assertEqual"

This commit is contained in:
Jenkins 2015-09-28 11:13:37 +00:00 committed by Gerrit Code Review
parent a64c916700 ee9ecfca16
commit a079628cb5
11 changed files with 65 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glance/tests/functional/db/base_metadef.py
View File

@ -409,7 +409,7 @@ class MetadefObjectTests(object):
found = self.db_api.metadef_object_get_all(
self.context, ns_created['namespace'])
self.assertEqual(len(found), 2)
self.assertEqual(2, len(found))
def test_object_update(self):
delta = {'name': u'New-name', 'json_schema': u'new-schema',

4
glance/tests/unit/common/test_location_strategy.py
View File

@ -172,7 +172,7 @@ class TestStoreTypeStrategyModule(base.IsolatedUnitTest):
ordered_locs = store_type.get_ordered_locations(copy.deepcopy(locs))
locs.sort(key=lambda loc: loc['metadata']['idx'])
# The result will ordered by preferred store type order.
self.assertEqual(ordered_locs, locs)
self.assertEqual(locs, ordered_locs)
def test_get_ordered_locations_with_invalid_store_name(self):
self.config(store_type_preference=[' rbd', 'sheepdog ', 'invalid',
@ -190,4 +190,4 @@ class TestStoreTypeStrategyModule(base.IsolatedUnitTest):
ordered_locs = store_type.get_ordered_locations(copy.deepcopy(locs))
locs.sort(key=lambda loc: loc['metadata']['idx'])
# The result will ordered by preferred store type order.
self.assertEqual(ordered_locs, locs)
self.assertEqual(locs, ordered_locs)

14
glance/tests/unit/test_cache_middleware.py Normal file → Executable file
View File

@ -372,12 +372,10 @@ class TestCacheMiddlewareProcessRequest(base.IsolatedUnitTest):
cache_filter = ProcessRequestTestCacheFilter()
response = cache_filter._process_v2_request(
request, image_id, dummy_img_iterator, image_meta)
self.assertEqual(response.headers['Content-Type'],
'application/octet-stream')
self.assertEqual(response.headers['Content-MD5'],
'c1234')
self.assertEqual(response.headers['Content-Length'],
'123456789')
self.assertEqual('application/octet-stream',
response.headers['Content-Type'])
self.assertEqual('c1234', response.headers['Content-MD5'])
self.assertEqual('123456789', response.headers['Content-Length'])
def test_process_request_without_download_image_policy(self):
"""
@ -732,7 +730,7 @@ class TestCacheMiddlewareProcessResponse(base.IsolatedUnitTest):
request.context = context.RequestContext(roles=['member'])
resp = webob.Response(request=request)
actual = cache_filter.process_response(resp)
self.assertEqual(actual, resp)
self.assertEqual(resp, actual)
def test_v1_process_response_image_meta_not_found(self):
"""
@ -837,4 +835,4 @@ class TestCacheMiddlewareProcessResponse(base.IsolatedUnitTest):
request.context = context.RequestContext(roles=['member'])
resp = webob.Response(request=request)
actual = cache_filter.process_response(resp)
self.assertEqual(actual, resp)
self.assertEqual(resp, actual)

4
glance/tests/unit/test_migrations.py
View File

@ -996,7 +996,7 @@ class MigrationsMixin(test_migrations.WalkVersionsMixin):
r = list(results)
self.assertEqual(1, len(r))
self.assertIn('status', r[0])
self.assertEqual(r[0]['status'], status_list[idx])
self.assertEqual(status_list[idx], r[0]['status'])
def _post_downgrade_033(self, engine):
image_locations = db_utils.get_table(engine, 'image_locations')
@ -1857,7 +1857,7 @@ class TestMysqlMigrations(test_base.MySQLOpportunisticTestCase,
"AND TABLE_NAME!='migrate_version'"
% self.migrate_engine.url.database)
count = noninnodb.scalar()
self.assertEqual(count, 0, "%d non InnoDB tables created" % count)
self.assertEqual(0, count, "%d non InnoDB tables created" % count)
class TestPostgresqlMigrations(test_base.PostgreSQLOpportunisticTestCase,

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

@ -1129,7 +1129,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
req.headers[k] = v
res = req.get_response(self.api)
self.assertEqual(res.status_int, 409)
self.assertEqual(409, res.status_int)
def test_add_location_with_invalid_location_on_conflict_image_size(self):
"""Tests creates an image from location and conflict image size"""
@ -1670,7 +1670,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
# Ensure cleanup occurred.
self.assertEqual(1, mock_init_del.call_count)
self.assertEqual(state_changes, ['saving', 'active'])
self.assertEqual(['saving', 'active'], state_changes)
def test_register_and_upload(self):
"""
@ -2305,7 +2305,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
res_dict = jsonutils.loads(res.body)
images = res_dict['images']
self.assertEqual(1, len(images))
self.assertEqual(images[0]['id'], UUID4)
self.assertEqual(UUID4, images[0]['id'])
# Expect 0 images (0 deleted)
req = webob.Request.blank('/images/detail?changes-since=%s' %
@ -2333,9 +2333,9 @@ class TestGlanceAPI(base.IsolatedUnitTest):
res_dict = jsonutils.loads(res.body)
images = res_dict['images']
self.assertEqual(3, len(images))
self.assertEqual(images[0]['id'], UUID4)
self.assertEqual(images[1]['id'], UUID3) # deleted
self.assertEqual(images[2]['id'], UUID2)
self.assertEqual(UUID4, images[0]['id'])
self.assertEqual(UUID3, images[1]['id']) # deleted
self.assertEqual(UUID2, images[2]['id'])
# Bad request (empty changes-since param)
req = webob.Request.blank('/images/detail?changes-since=')
@ -2399,8 +2399,8 @@ class TestGlanceAPI(base.IsolatedUnitTest):
self.assertEqual(200, res.status_int)
images = jsonutils.loads(res.body)['images']
self.assertEqual(2, len(images))
self.assertEqual(images[0]['id'], image2_id)
self.assertEqual(images[1]['id'], image1_id)
self.assertEqual(image2_id, images[0]['id'])
self.assertEqual(image1_id, images[1]['id'])
# Test index with filter containing one user-defined property but
# non-existent value. Filter is 'property-distro=fedora'.
@ -2419,7 +2419,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
self.assertEqual(200, res.status_int)
images = jsonutils.loads(res.body)['images']
self.assertEqual(1, len(images))
self.assertEqual(images[0]['id'], image1_id)
self.assertEqual(image1_id, images[0]['id'])
# Test index with filter containing one user-defined property but
# unique value. Filter is 'property-arch=x86_64'.
@ -2429,7 +2429,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
self.assertEqual(200, res.status_int)
images = jsonutils.loads(res.body)['images']
self.assertEqual(1, len(images))
self.assertEqual(images[0]['id'], image2_id)
self.assertEqual(image2_id, images[0]['id'])
# Test index with filter containing unique user-defined property.
# Filter is 'property-foo=bar'.
@ -2439,7 +2439,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
self.assertEqual(200, res.status_int)
images = jsonutils.loads(res.body)['images']
self.assertEqual(1, len(images))
self.assertEqual(images[0]['id'], image2_id)
self.assertEqual(image2_id, images[0]['id'])
# Test index with filter containing unique user-defined property but
# .value is non-existent. Filter is 'property-foo=baz'.
@ -2459,7 +2459,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
self.assertEqual(200, res.status_int)
images = jsonutils.loads(res.body)['images']
self.assertEqual(1, len(images))
self.assertEqual(images[0]['id'], image2_id)
self.assertEqual(image2_id, images[0]['id'])
# Test index with filter containing multiple user-defined properties
# Filter is 'property-arch=i386&property-distro=ubuntu'.
@ -2470,7 +2470,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
self.assertEqual(200, res.status_int)
images = jsonutils.loads(res.body)['images']
self.assertEqual(1, len(images))
self.assertEqual(images[0]['id'], image1_id)
self.assertEqual(image1_id, images[0]['id'])
# Test index with filter containing multiple user-defined properties.
# Filter is 'property-arch=random&property-distro=ubuntu'.
@ -3066,9 +3066,8 @@ class TestGlanceAPI(base.IsolatedUnitTest):
res = req.get_response(self.api)
self.assertEqual(403, res.status_int)
prop = k[len('x-image-meta-'):]
self.assertNotEqual(res.body.find("Forbidden to modify '%s' "
"of active "
"image" % prop), -1)
self.assertNotEqual(-1, res.body.find(
"Forbidden to modify '%s' of active image" % prop))
req = webob.Request.blank('/images/%s' % UUID2)
req.method = 'HEAD'
@ -3654,7 +3653,7 @@ class TestImageSerializer(base.IsolatedUnitTest):
for chunk in response.app_iter:
pass
self.assertNotEqual(response.request.environ['eventlet.posthooks'], [])
self.assertNotEqual([], response.request.environ['eventlet.posthooks'])
def test_image_send_notification(self):
req = webob.Request.blank("/images/%s" % UUID2)

24
glance/tests/unit/v1/test_registry_api.py
View File

@ -1402,7 +1402,7 @@ class TestRegistryAPI(base.IsolatedUnitTest, test_utils.RegistryAPIMixIn):
res_dict = jsonutils.loads(res.body)
new_num_images = len(res_dict['images'])
self.assertEqual(new_num_images, orig_num_images - 1)
self.assertEqual(orig_num_images - 1, new_num_images)
def test_delete_image_response(self):
"""Tests that the registry API delete returns the image metadata"""
@ -1463,7 +1463,7 @@ class TestRegistryAPI(base.IsolatedUnitTest, test_utils.RegistryAPIMixIn):
memb_list = jsonutils.loads(res.body)
num_members = len(memb_list['members'])
self.assertEqual(num_members, 0)
self.assertEqual(0, num_members)
def test_get_image_members_not_existing(self):
"""
@ -1498,7 +1498,7 @@ class TestRegistryAPI(base.IsolatedUnitTest, test_utils.RegistryAPIMixIn):
memb_list = jsonutils.loads(res.body)
num_members = len(memb_list['shared_images'])
self.assertEqual(num_members, 0)
self.assertEqual(0, num_members)
def test_replace_members(self):
"""
@ -1525,7 +1525,7 @@ class TestRegistryAPI(base.IsolatedUnitTest, test_utils.RegistryAPIMixIn):
req.content_type = 'application/json'
req.body = jsonutils.dumps(dict(image_memberships=fixture))
res = req.get_response(self.api)
self.assertEqual(res.status_int, 404)
self.assertEqual(404, res.status_int)
def test_update_all_image_members_invalid_membership_association(self):
"""
@ -1547,7 +1547,7 @@ class TestRegistryAPI(base.IsolatedUnitTest, test_utils.RegistryAPIMixIn):
memb_list = jsonutils.loads(res.body)
num_members = len(memb_list['members'])
self.assertEqual(num_members, 1)
self.assertEqual(1, num_members)
fixture = dict(member_id='test1')
body = jsonutils.dumps(dict(image_memberships=fixture))
@ -1573,7 +1573,7 @@ class TestRegistryAPI(base.IsolatedUnitTest, test_utils.RegistryAPIMixIn):
req.body = jsonutils.dumps(dict(image_memberships=fixture))
res = req.get_response(api)
self.assertEqual(res.status_int, 403)
self.assertEqual(403, res.status_int)
def test_update_all_image_members(self):
"""
@ -1695,7 +1695,7 @@ class TestRegistryAPI(base.IsolatedUnitTest, test_utils.RegistryAPIMixIn):
req.body = jsonutils.dumps(dict(member=fixture))
res = req.get_response(api)
self.assertEqual(res.status_int, 403)
self.assertEqual(403, res.status_int)
def test_add_member_to_image_bad_request(self):
"""
@ -1764,7 +1764,7 @@ class TestRegistryAPI(base.IsolatedUnitTest, test_utils.RegistryAPIMixIn):
req.content_type = 'application/json'
res = req.get_response(api)
self.assertEqual(res.status_int, 403)
self.assertEqual(403, res.status_int)
def test_add_member_delete_create(self):
"""
@ -1948,10 +1948,10 @@ class TestRegistryAPILocations(base.IsolatedUnitTest,
image['location_data'][1]['metadata'])
image_entry = db_api.image_get(self.context, image['id'])
self.assertEqual(image_entry['locations'][0]['url'],
encrypted_location_url1)
self.assertEqual(image_entry['locations'][1]['url'],
encrypted_location_url2)
self.assertEqual(encrypted_location_url1,
image_entry['locations'][0]['url'])
self.assertEqual(encrypted_location_url2,
image_entry['locations'][1]['url'])
decrypted_location_url1 = crypt.urlsafe_decrypt(
encryption_key, image_entry['locations'][0]['url'])
decrypted_location_url2 = crypt.urlsafe_decrypt(

6
glance/tests/unit/v2/test_image_data_resource.py
View File

@ -329,7 +329,7 @@ class TestImagesController(base.StoreClearingUnitTest):
prepare_updated_at = output_log[0]['payload']['updated_at']
del output_log[0]['payload']['updated_at']
self.assertTrue(prepare_updated_at <= output['meta']['updated_at'])
self.assertEqual(output_log[0], prepare_log)
self.assertEqual(prepare_log, output_log[0])
def _test_upload_download_upload_notification(self):
request = unit_test_utils.get_fake_request()
@ -343,7 +343,7 @@ class TestImagesController(base.StoreClearingUnitTest):
'payload': upload_payload,
}
self.assertEqual(3, len(output_log))
self.assertEqual(output_log[1], upload_log)
self.assertEqual(upload_log, output_log[1])
def _test_upload_download_activate_notification(self):
request = unit_test_utils.get_fake_request()
@ -357,7 +357,7 @@ class TestImagesController(base.StoreClearingUnitTest):
'payload': activate_payload,
}
self.assertEqual(3, len(output_log))
self.assertEqual(output_log[2], activate_log)
self.assertEqual(activate_log, output_log[2])
def test_restore_image_when_upload_failed(self):
request = unit_test_utils.get_fake_request()

30
glance/tests/unit/v2/test_images_resource.py
View File

@ -816,7 +816,7 @@ class TestImagesController(base.IsolatedUnitTest):
{'op': 'replace', 'path': ['tags'], 'value': ['king', 'kong']},
]
output = self.controller.update(request, UUID1, changes)
self.assertEqual(output.image_id, UUID1)
self.assertEqual(UUID1, output.image_id)
self.assertEqual(2, len(output.tags))
self.assertIn('king', output.tags)
self.assertIn('kong', output.tags)
@ -1510,8 +1510,8 @@ class TestImagesController(base.IsolatedUnitTest):
'path': ['name'], 'value': 'fedora'
}]
output = self.controller.update(request, UUID1, changes)
self.assertEqual(output.image_id, UUID1)
self.assertEqual(output.name, 'fedora')
self.assertEqual(UUID1, output.image_id)
self.assertEqual('fedora', output.name)
def test_update_add_extra_property_json_schema_version_10(self):
self.db.image_update(None, UUID1, {'properties': {'foo': 'bar'}})
@ -1521,8 +1521,8 @@ class TestImagesController(base.IsolatedUnitTest):
'path': ['foo'], 'value': 'baz'
}]
output = self.controller.update(request, UUID1, changes)
self.assertEqual(output.image_id, UUID1)
self.assertEqual(output.extra_properties, {'foo': 'baz'})
self.assertEqual(UUID1, output.image_id)
self.assertEqual({'foo': 'baz'}, output.extra_properties)
def test_update_add_property_already_present_json_schema_version_4(self):
request = unit_test_utils.get_fake_request()
@ -1545,15 +1545,15 @@ class TestImagesController(base.IsolatedUnitTest):
self.db.image_update(None, UUID1, {'properties': properties})
output = self.controller.show(request, UUID1)
self.assertEqual(output.extra_properties['foo'], 'bar')
self.assertEqual('bar', output.extra_properties['foo'])
changes = [
{'json_schema_version': 10, 'op': 'add',
'path': ['foo'], 'value': 'baz'},
]
output = self.controller.update(request, UUID1, changes)
self.assertEqual(output.image_id, UUID1)
self.assertEqual(output.extra_properties, {'foo': 'baz'})
self.assertEqual(UUID1, output.image_id)
self.assertEqual({'foo': 'baz'}, output.extra_properties)
def test_update_add_locations(self):
new_location = {'url': '%s/fake_location' % BASE_URI, 'metadata': {}}
@ -1801,7 +1801,7 @@ class TestImagesController(base.IsolatedUnitTest):
request = unit_test_utils.get_fake_request()
changes = [{'op': 'remove', 'path': ['locations', '0']}]
output = self.controller.update(request, UUID1, changes)
self.assertEqual(output.image_id, UUID1)
self.assertEqual(UUID1, output.image_id)
self.assertEqual(0, len(output.locations))
self.assertEqual('queued', output.status)
self.assertIsNone(output.size)
@ -2514,7 +2514,7 @@ class TestImagesDeserializer(test_utils.BaseTestCase):
doc = [{'op': 'replace', 'path': '%s' % encoded, 'value': 'dummy'}]
request.body = jsonutils.dumps(doc)
output = self.deserializer.update(request)
self.assertEqual(output['changes'][0]['path'], decoded)
self.assertEqual(decoded, output['changes'][0]['path'])
def test_update_deep_limited_attributes(self):
samples = {
@ -2656,7 +2656,7 @@ class TestImagesDeserializer(test_utils.BaseTestCase):
path = '/images?marker=%s' % marker
request = unit_test_utils.get_fake_request(path)
output = self.deserializer.index(request)
self.assertEqual(output.get('marker'), marker)
self.assertEqual(marker, output.get('marker'))
def test_index_marker_not_specified(self):
request = unit_test_utils.get_fake_request('/images')
@ -2887,8 +2887,8 @@ class TestImagesDeserializer(test_utils.BaseTestCase):
path = '/images?tag=%s&tag=%s' % ('x86', '64bit')
request = unit_test_utils.get_fake_request(path)
output = self.deserializer.index(request)
self.assertEqual(sorted(output['filters']['tags']),
sorted(['x86', '64bit']))
self.assertEqual(sorted(['x86', '64bit']),
sorted(output['filters']['tags']))
class TestImagesDeserializerWithExtendedSchema(test_utils.BaseTestCase):
@ -3231,7 +3231,7 @@ class TestImagesSerializer(test_utils.BaseTestCase):
}
response = webob.Response()
self.serializer.create(response, self.fixtures[0])
self.assertEqual(response.status_int, 201)
self.assertEqual(201, response.status_int)
actual = jsonutils.loads(response.body)
actual['tags'] = sorted(actual['tags'])
self.assertEqual(expected, actual)
@ -3390,7 +3390,7 @@ class TestImagesSerializerWithUnicode(test_utils.BaseTestCase):
}
response = webob.Response()
self.serializer.create(response, self.fixtures[0])
self.assertEqual(response.status_int, 201)
self.assertEqual(201, response.status_int)
actual = jsonutils.loads(response.body)
actual['tags'] = sorted(actual['tags'])
self.assertEqual(expected, actual)

4
glance/tests/unit/v2/test_metadef_resources.py
View File

@ -255,7 +255,7 @@ class TestMetadefsControllers(base.IsolatedUnitTest):
actual = set([namespace.namespace for
namespace in output['namespaces']])
expected = set([NAMESPACE1, NAMESPACE3, NAMESPACE5, NAMESPACE6])
self.assertEqual(actual, expected)
self.assertEqual(expected, actual)
def test_namespace_index_admin(self):
request = unit_test_utils.get_fake_request(is_admin=True)
@ -846,7 +846,7 @@ class TestMetadefsControllers(base.IsolatedUnitTest):
output = self.property_controller.show(
request, NAMESPACE6, ''.join([PREFIX1, PROPERTY4]),
filters={'resource_type': RESOURCE_TYPE4})
self.assertEqual(output.name, PROPERTY4)
self.assertEqual(PROPERTY4, output.name)
def test_property_show_prefix_mismatch(self):
request = unit_test_utils.get_fake_request()

4
glance/tests/unit/v2/test_schemas_resource.py
View File

@ -48,7 +48,7 @@ class TestSchemasController(test_utils.BaseTestCase):
def test_member(self):
req = unit_test_utils.get_fake_request()
output = self.controller.member(req)
self.assertEqual(output['name'], 'member')
self.assertEqual('member', output['name'])
expected = set(['status', 'created_at', 'updated_at', 'image_id',
'member_id', 'schema'])
self.assertEqual(expected, set(output['properties'].keys()))
@ -56,6 +56,6 @@ class TestSchemasController(test_utils.BaseTestCase):
def test_members(self):
req = unit_test_utils.get_fake_request()
output = self.controller.members(req)
self.assertEqual(output['name'], 'members')
self.assertEqual('members', output['name'])
expected = set(['schema', 'members'])
self.assertEqual(expected, set(output['properties'].keys()))

8
glance/tests/unit/v2/test_tasks_resource.py
View File

@ -179,7 +179,7 @@ class TestTasksController(test_utils.BaseTestCase):
self.assertEqual(4, len(output['tasks']))
actual = set([task.task_id for task in output['tasks']])
expected = set([UUID1, UUID2, UUID3, UUID4])
self.assertEqual(sorted(actual), sorted(expected))
self.assertEqual(sorted(expected), sorted(actual))
def test_index_with_many_filters(self):
url = '/tasks?status=pending&type=import'
@ -747,7 +747,7 @@ class TestTasksSerializer(test_utils.BaseTestCase):
self.serializer.create(response, self.fixtures[3])
serialized_task = jsonutils.loads(response.body)
self.assertEqual(response.status_int, 201)
self.assertEqual(201, response.status_int)
self.assertEqual(self.fixtures[3].task_id,
serialized_task['id'])
self.assertEqual(self.fixtures[3].task_input,
@ -761,7 +761,7 @@ class TestTasksSerializer(test_utils.BaseTestCase):
self.serializer.create(response, self.fixtures[0])
serialized_task = jsonutils.loads(response.body)
self.assertEqual(response.status_int, 201)
self.assertEqual(201, response.status_int)
self.assertEqual(self.fixtures[0].task_id,
serialized_task['id'])
self.assertEqual(self.fixtures[0].task_input,
@ -774,7 +774,7 @@ class TestTasksSerializer(test_utils.BaseTestCase):
self.serializer.create(response, self.fixtures[1])
serialized_task = jsonutils.loads(response.body)
self.assertEqual(response.status_int, 201)
self.assertEqual(201, response.status_int)
self.assertEqual(self.fixtures[1].task_id,
serialized_task['id'])
self.assertEqual(self.fixtures[1].task_input,