openstack
/
glance
Code Issues Proposed changes

Replaces assertEqual with assertTrue and assertFalse 

In order to improve coding practices and be aligned to a standard,
self.assertEqual(...,True) statements where replaced with
self.assertTrue and self.assertFalse.

Change-Id: I4150a343493beae03d6f71c88e84f60d14fb60e1
Closes-Bug: #1230127
This commit is contained in:
Bartosz Fic 2014-09-12 10:49:16 +02:00
parent e550cac697
commit 0b246bb5f5
11 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
glance/tests/functional/db/base.py
View File

@ -145,13 +145,13 @@ class DriverTests(object):
self.assertEqual(0, image['min_ram'])
self.assertEqual(0, image['min_disk'])
self.assertIsNone(image['owner'])
self.assertEqual(False, image['is_public'])
self.assertFalse(image['is_public'])
self.assertIsNone(image['size'])
self.assertIsNone(image['checksum'])
self.assertIsNone(image['disk_format'])
self.assertEqual([], image['locations'])
self.assertEqual(False, image['protected'])
self.assertEqual(False, image['deleted'])
self.assertFalse(image['protected'])
self.assertFalse(image['deleted'])
self.assertIsNone(image['deleted_at'])
self.assertEqual([], image['properties'])
self.assertEqual(image['created_at'], create_time)
@ -264,13 +264,13 @@ class DriverTests(object):
# New properties are set
self.assertTrue('ping' in properties)
self.assertEqual(properties['ping']['value'], 'pong')
self.assertEqual(properties['ping']['deleted'], False)
self.assertFalse(properties['ping']['deleted'])
# Original properties still show up, but with deleted=True
# TODO(markwash): db api should not return deleted properties
self.assertTrue('foo' in properties)
self.assertEqual(properties['foo']['value'], 'bar')
self.assertEqual(properties['foo']['deleted'], True)
self.assertTrue(properties['foo']['deleted'])
def test_image_property_delete(self):
fixture = {'name': 'ping', 'value': 'pong', 'image_id': UUID1}
@ -1595,7 +1595,7 @@ class TaskTests(test_utils.BaseTestCase):
self.assertEqual(task['input'], {'ping': 'pong'})
self.assertEqual(task['result'], result)
self.assertEqual(task['message'], 'This is a error string')
self.assertEqual(task['deleted'], False)
self.assertFalse(task['deleted'])
self.assertIsNone(task['deleted_at'])
self.assertIsNone(task['expires_at'])
self.assertEqual(task['created_at'], task_values['created_at'])
@ -1620,7 +1620,7 @@ class TaskTests(test_utils.BaseTestCase):
self.assertIsNone(task['input'])
self.assertIsNone(task['result'])
self.assertIsNone(task['message'])
self.assertEqual(task['deleted'], False)
self.assertFalse(task['deleted'])
self.assertIsNone(task['deleted_at'])
self.assertIsNone(task['expires_at'])
self.assertEqual(task['created_at'], task_values['created_at'])
@ -1631,7 +1631,7 @@ class TaskTests(test_utils.BaseTestCase):
task = self.db_api.task_create(self.context, task_values)
self.assertIsNotNone(task)
self.assertEqual(task['deleted'], False)
self.assertFalse(task['deleted'])
self.assertIsNone(task['deleted_at'])
task_id = task['id']
@ -1644,7 +1644,7 @@ class TaskTests(test_utils.BaseTestCase):
task = self.db_api.task_create(self.context, task_values)
self.assertIsNotNone(task)
self.assertEqual(task['deleted'], False)
self.assertFalse(task['deleted'])
self.assertIsNone(task['deleted_at'])
task_id = task['id']
@ -1654,7 +1654,7 @@ class TaskTests(test_utils.BaseTestCase):
force_show_deleted=True)
self.assertIsNotNone(del_task)
self.assertEqual(task_id, del_task['id'])
self.assertEqual(True, del_task['deleted'])
self.assertTrue(del_task['deleted'])
self.assertIsNotNone(del_task['deleted_at'])

2
glance/tests/functional/test_bin_glance_cache_manage.py
View File

@ -66,7 +66,7 @@ class TestBinGlanceCacheManage(functional.FunctionalTest):
hashlib.md5(image_data).hexdigest())
self.assertEqual(data['image']['size'], FIVE_KB)
self.assertEqual(data['image']['name'], name)
self.assertEqual(data['image']['is_public'], True)
self.assertTrue(data['image']['is_public'])
return data['image']['id']
def is_image_cached(self, image_id):

6
glance/tests/functional/test_cache_middleware.py
View File

@ -67,7 +67,7 @@ class BaseCacheMiddlewareTest(object):
hashlib.md5(image_data).hexdigest())
self.assertEqual(data['image']['size'], FIVE_KB)
self.assertEqual(data['image']['name'], "Image1")
self.assertEqual(data['image']['is_public'], True)
self.assertTrue(data['image']['is_public'])
image_id = data['image']['id']
@ -239,7 +239,7 @@ class BaseCacheMiddlewareTest(object):
hashlib.md5(image_data).hexdigest())
self.assertEqual(data['image']['size'], FIVE_KB)
self.assertEqual(data['image']['name'], "Image1")
self.assertEqual(data['image']['is_public'], True)
self.assertTrue(data['image']['is_public'])
image_id = data['image']['id']
@ -364,7 +364,7 @@ class BaseCacheManageMiddlewareTest(object):
hashlib.md5(image_data).hexdigest())
self.assertEqual(data['image']['size'], FIVE_KB)
self.assertEqual(data['image']['name'], name)
self.assertEqual(data['image']['is_public'], True)
self.assertTrue(data['image']['is_public'])
return data['image']['id']
def verify_no_cached_images(self):

8
glance/tests/functional/v1/test_api.py
View File

@ -143,7 +143,7 @@ class TestApi(functional.FunctionalTest):
hashlib.md5(image_data).hexdigest())
self.assertEqual(data['image']['size'], FIVE_KB)
self.assertEqual(data['image']['name'], "Image1")
self.assertEqual(data['image']['is_public'], True)
self.assertTrue(data['image']['is_public'])
# 3. HEAD image
# Verify image found now
@ -406,7 +406,7 @@ class TestApi(functional.FunctionalTest):
hashlib.md5(image_data).hexdigest())
self.assertEqual(data['image']['size'], FIVE_KB)
self.assertEqual(data['image']['name'], "Image2")
self.assertEqual(data['image']['is_public'], True)
self.assertTrue(data['image']['is_public'])
self.assertEqual(data['image']['properties']['distro'], 'Ubuntu')
self.assertEqual(data['image']['properties']['arch'], 'i386')
self.assertEqual(data['image']['properties']['foo'], 'bar')
@ -591,7 +591,7 @@ class TestApi(functional.FunctionalTest):
hashlib.md5(image_data).hexdigest())
self.assertEqual(data['image']['size'], FIVE_KB)
self.assertEqual(data['image']['name'], "Image1")
self.assertEqual(data['image']['is_public'], True)
self.assertTrue(data['image']['is_public'])
# 1. HEAD image
# Verify image found now
@ -670,7 +670,7 @@ class TestApi(functional.FunctionalTest):
hashlib.md5(image_data).hexdigest())
self.assertEqual(data['image']['size'], FIVE_KB)
self.assertEqual(data['image']['name'], "Image1")
self.assertEqual(data['image']['is_public'], True)
self.assertTrue(data['image']['is_public'])
# 1. HEAD image
# Verify image found now

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

@ -64,7 +64,7 @@ class TestMiscellaneous(functional.FunctionalTest):
hashlib.md5(image_data).hexdigest())
self.assertEqual(data['image']['size'], FIVE_KB)
self.assertEqual(data['image']['name'], "Image1")
self.assertEqual(data['image']['is_public'], True)
self.assertTrue(data['image']['is_public'])
# 2. REMOVE the image from the filesystem
image_path = "%s/images/%s" % (self.test_dir, data['image']['id'])

14
glance/tests/functional/v1/test_ssl.py
View File

@ -161,7 +161,7 @@ class TestSSL(functional.FunctionalTest):
hashlib.md5(image_data).hexdigest())
self.assertEqual(data['image']['size'], FIVE_KB)
self.assertEqual(data['image']['name'], "Image1")
self.assertEqual(data['image']['is_public'], True)
self.assertTrue(data['image']['is_public'])
image_id = data['image']['id']
@ -384,7 +384,7 @@ class TestSSL(functional.FunctionalTest):
self.assertEqual(data['image']['container_format'], 'ovf')
self.assertEqual(data['image']['disk_format'], 'raw')
self.assertEqual(data['image']['name'], "Image1")
self.assertEqual(data['image']['is_public'], True)
self.assertTrue(data['image']['is_public'])
image_id = data['image']['id']
@ -430,7 +430,7 @@ class TestSSL(functional.FunctionalTest):
hashlib.md5(image_data).hexdigest())
self.assertEqual(data['image']['size'], FIVE_KB)
self.assertEqual(data['image']['name'], "Image1")
self.assertEqual(data['image']['is_public'], True)
self.assertTrue(data['image']['is_public'])
# 5. HEAD image
# Verify status is in active
@ -709,7 +709,7 @@ class TestSSL(functional.FunctionalTest):
self.assertEqual(response.status, 201)
data = jsonutils.loads(content)
self.assertEqual(data['image']['properties']['pants'], "are on")
self.assertEqual(data['image']['is_public'], True)
self.assertTrue(data['image']['is_public'])
headers = {'Content-Type': 'application/octet-stream',
'X-Image-Meta-Name': 'My Image!',
@ -725,7 +725,7 @@ class TestSSL(functional.FunctionalTest):
self.assertEqual(response.status, 201)
data = jsonutils.loads(content)
self.assertEqual(data['image']['properties']['pants'], "are on")
self.assertEqual(data['image']['is_public'], True)
self.assertTrue(data['image']['is_public'])
headers = {'Content-Type': 'application/octet-stream',
'X-Image-Meta-Name': 'My Image!',
@ -741,7 +741,7 @@ class TestSSL(functional.FunctionalTest):
self.assertEqual(response.status, 201)
data = jsonutils.loads(content)
self.assertEqual(data['image']['properties']['pants'], "are off")
self.assertEqual(data['image']['is_public'], True)
self.assertTrue(data['image']['is_public'])
headers = {'Content-Type': 'application/octet-stream',
'X-Image-Meta-Name': 'My Private Image',
@ -755,7 +755,7 @@ class TestSSL(functional.FunctionalTest):
response, content = https.request(path, 'POST', headers=headers)
self.assertEqual(response.status, 201)
data = jsonutils.loads(content)
self.assertEqual(data['image']['is_public'], False)
self.assertFalse(data['image']['is_public'])
# 2. GET /images
# Verify three public images

2
glance/tests/functional/v2/test_images.py
View File

@ -283,7 +283,7 @@ class TestImages(functional.FunctionalTest):
self.assertNotIn('size', image)
self.assertNotIn('virtual_size', image)
self.assertEqual('bar', image['foo'])
self.assertEqual(False, image['protected'])
self.assertFalse(image['protected'])
self.assertEqual('kernel', image['type'])
self.assertTrue(image['created_at'])
self.assertTrue(image['updated_at'])

2
glance/tests/functional/v2/test_metadef_namespaces.py
View File

@ -104,7 +104,7 @@ class TestNamespaces(functional.FunctionalTest):
self.assertNotIn('object', namespace)
self.assertEqual(TENANT1, namespace['owner'])
self.assertEqual('private', namespace['visibility'])
self.assertEqual(False, namespace['protected'])
self.assertFalse(namespace['protected'])
# The namespace should be mutable
path = self._url('/v2/metadefs/namespaces/%s' % namespace_name)

14
glance/tests/integration/legacy_functional/test_v1_api.py
View File

@ -56,7 +56,7 @@ class TestApi(base.ApiTest):
hashlib.md5(image_data).hexdigest())
self.assertEqual(data['image']['size'], FIVE_KB)
self.assertEqual(data['image']['name'], "Image1")
self.assertEqual(data['image']['is_public'], True)
self.assertTrue(data['image']['is_public'])
# 3. HEAD image
# Verify image found now
@ -260,7 +260,7 @@ class TestApi(base.ApiTest):
self.assertEqual(data['image']['container_format'], 'ovf')
self.assertEqual(data['image']['disk_format'], 'raw')
self.assertEqual(data['image']['name'], "Image1")
self.assertEqual(data['image']['is_public'], True)
self.assertTrue(data['image']['is_public'])
image_id = data['image']['id']
@ -299,7 +299,7 @@ class TestApi(base.ApiTest):
hashlib.md5(image_data).hexdigest())
self.assertEqual(data['image']['size'], FIVE_KB)
self.assertEqual(data['image']['name'], "Image1")
self.assertEqual(data['image']['is_public'], True)
self.assertTrue(data['image']['is_public'])
# 5. HEAD /images
# Verify status is in active
@ -427,7 +427,7 @@ class TestApi(base.ApiTest):
self.assertEqual(response.status, 201)
data = jsonutils.loads(content)
self.assertEqual(data['image']['properties']['pants'], "are on")
self.assertEqual(data['image']['is_public'], True)
self.assertTrue(data['image']['is_public'])
image_ids.append(data['image']['id'])
headers = {'Content-Type': 'application/octet-stream',
@ -444,7 +444,7 @@ class TestApi(base.ApiTest):
self.assertEqual(response.status, 201)
data = jsonutils.loads(content)
self.assertEqual(data['image']['properties']['pants'], "are on")
self.assertEqual(data['image']['is_public'], True)
self.assertTrue(data['image']['is_public'])
image_ids.append(data['image']['id'])
headers = {'Content-Type': 'application/octet-stream',
@ -461,7 +461,7 @@ class TestApi(base.ApiTest):
self.assertEqual(response.status, 201)
data = jsonutils.loads(content)
self.assertEqual(data['image']['properties']['pants'], "are off")
self.assertEqual(data['image']['is_public'], True)
self.assertTrue(data['image']['is_public'])
image_ids.append(data['image']['id'])
headers = {'Content-Type': 'application/octet-stream',
@ -476,7 +476,7 @@ class TestApi(base.ApiTest):
response, content = self.http.request(path, 'POST', headers=headers)
self.assertEqual(response.status, 201)
data = jsonutils.loads(content)
self.assertEqual(data['image']['is_public'], False)
self.assertFalse(data['image']['is_public'])
image_ids.append(data['image']['id'])
# 2. GET /images

2
glance/tests/unit/test_db_metadef.py
View File

@ -197,7 +197,7 @@ class TestMetadefRepo(test_utils.BaseTestCase):
self.assertEqual(namespace.description, 'desc1')
self.assertEqual(namespace.display_name, '1')
self.assertEqual(namespace.owner, TENANT1)
self.assertEqual(namespace.protected, True)
self.assertTrue(namespace.protected)
self.assertEqual(namespace.visibility, 'private')
def test_get_namespace_not_found(self):

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

@ -231,7 +231,7 @@ class TestMetadefsControllers(base.IsolatedUnitTest):
output = output.to_dict()
self.assertEqual(output['namespace'], NAMESPACE1)
self.assertEqual(output['owner'], TENANT1)
self.assertEqual(output['protected'], True)
self.assertTrue(output['protected'])
self.assertEqual(output['visibility'], 'private')
def test_namespace_show_with_related_resources(self):
@ -240,7 +240,7 @@ class TestMetadefsControllers(base.IsolatedUnitTest):
output = output.to_dict()
self.assertEqual(output['namespace'], NAMESPACE3)
self.assertEqual(output['owner'], TENANT3)
self.assertEqual(output['protected'], False)
self.assertFalse(output['protected'])
self.assertEqual(output['visibility'], 'public')
self.assertEqual(2, len(output['properties']))
@ -445,10 +445,10 @@ class TestMetadefsControllers(base.IsolatedUnitTest):
namespace.protected = False
namespace = self.namespace_controller.update(request, namespace,
NAMESPACE1)
self.assertEqual(namespace.protected, False)
self.assertFalse(namespace.protected)
namespace = self.namespace_controller.show(request, NAMESPACE1)
self.assertEqual(namespace.protected, False)
self.assertFalse(namespace.protected)
def test_namespace_update_non_existing(self):
request = unit_test_utils.get_fake_request()
@ -475,10 +475,10 @@ class TestMetadefsControllers(base.IsolatedUnitTest):
namespace.protected = False
namespace = self.namespace_controller.update(request, namespace,
NAMESPACE2)
self.assertEqual(namespace.protected, False)
self.assertFalse(namespace.protected)
namespace = self.namespace_controller.show(request, NAMESPACE2)
self.assertEqual(namespace.protected, False)
self.assertFalse(namespace.protected)
def test_namespace_update_name(self):
request = unit_test_utils.get_fake_request()