openstack
/
glance
Code Issues Proposed changes

Change assertTrue(isinstance()) by optimal assert 

Some of tests use different method of assertTrue(isinstance(A, B)) or
assertEqual(type(A), B). The correct way is to use assertIsInstance(A, B)
provided by testtools.

Change-Id: Ia8d38f73c159c7ef943a8f6cfe72b945cc493947
Closes-bug: #1268480
This commit is contained in:
wanghong 2014-01-15 18:58:33 +08:00
parent 65d5039b4b
commit 3d03291df8
13 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glance/tests/unit/common/test_config.py
View File

@ -70,7 +70,7 @@ class TestPasteApp(test_utils.BaseTestCase):
app = config.load_paste_app('glance-registry')
self.assertEqual(expected_app_type, type(app))
self.assertIsInstance(app, expected_app_type)
def test_load_paste_app(self):
expected_middleware = context.UnauthenticatedContextMiddleware

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

@ -131,7 +131,7 @@ class TestRPCController(base.IsolatedUnitTest):
])
res = req.get_response(api)
returned = jsonutils.loads(res.body)
self.assertTrue(isinstance(returned, list))
self.assertIsInstance(returned, list)
self.assertEqual(returned[0], 1)
def test_request_exc(self):
@ -252,7 +252,7 @@ class TestRPCClient(base.IsolatedUnitTest):
def test_non_str_or_dict_response(self):
rst = self.client.count_images(images=[1, 2, 3, 4])
self.assertEqual(rst, 4)
self.assertTrue(isinstance(rst, int))
self.assertIsInstance(rst, int)
class TestRPCJSONSerializer(test_utils.BaseTestCase):

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

@ -276,7 +276,7 @@ class ServerTest(test_utils.BaseTestCase):
def test_create_pool(self):
"""Ensure the wsgi thread pool is an eventlet.greenpool.GreenPool."""
actual = wsgi.Server(threads=1).create_pool()
self.assertTrue(isinstance(actual, eventlet.greenpool.GreenPool))
self.assertIsInstance(actual, eventlet.greenpool.GreenPool)
class TestHelpers(test_utils.BaseTestCase):
@ -297,7 +297,7 @@ class TestHelpers(test_utils.BaseTestCase):
'properties': {'distro': 'Ubuntu 10.04 LTS'}}
headers = utils.image_meta_to_http_headers(fixture)
for k, v in headers.iteritems():
self.assertTrue(isinstance(v, unicode), "%s is not unicode" % v)
self.assertIsInstance(v, unicode)
def test_data_passed_properly_through_headers(self):
"""

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

@ -126,13 +126,13 @@ class TestKeystoneAuthPlugin(utils.BaseTestCase):
def test_get_plugin_from_strategy_keystone(self):
strategy = auth.get_plugin_from_strategy('keystone')
self.assertTrue(isinstance(strategy, auth.KeystoneStrategy))
self.assertIsInstance(strategy, auth.KeystoneStrategy)
self.assertTrue(strategy.configure_via_auth)
def test_get_plugin_from_strategy_keystone_configure_via_auth_false(self):
strategy = auth.get_plugin_from_strategy('keystone',
configure_via_auth=False)
self.assertTrue(isinstance(strategy, auth.KeystoneStrategy))
self.assertIsInstance(strategy, auth.KeystoneStrategy)
self.assertFalse(strategy.configure_via_auth)
def test_required_creds(self):

18
glance/tests/unit/test_domain_proxy.py
View File

@ -91,7 +91,7 @@ class TestProxyRepoWrapping(test_utils.BaseTestCase):
self.fake_repo.result = base_result
method = getattr(self.proxy_repo, name)
proxy_result = method(*args, **kwargs)
self.assertTrue(isinstance(proxy_result, FakeProxy))
self.assertIsInstance(proxy_result, FakeProxy)
self.assertEqual(proxy_result.base, base_result)
self.assertEqual(len(proxy_result.args), 0)
self.assertEqual(proxy_result.kwargs, {'a': 1})
@ -101,7 +101,7 @@ class TestProxyRepoWrapping(test_utils.BaseTestCase):
def test_get(self):
self.fake_repo.result = 'snarf'
result = self.proxy_repo.get('some-id')
self.assertTrue(isinstance(result, FakeProxy))
self.assertIsInstance(result, FakeProxy)
self.assertEqual(self.fake_repo.args, ('some-id',))
self.assertEqual(self.fake_repo.kwargs, {})
self.assertEqual(result.base, 'snarf')
@ -115,7 +115,7 @@ class TestProxyRepoWrapping(test_utils.BaseTestCase):
self.assertEqual(self.fake_repo.kwargs, {'prefix': 's'})
self.assertEqual(len(results), 2)
for i in xrange(2):
self.assertTrue(isinstance(results[i], FakeProxy))
self.assertIsInstance(results[i], FakeProxy)
self.assertEqual(results[i].base, self.fake_repo.result[i])
self.assertEqual(results[i].args, tuple())
self.assertEqual(results[i].kwargs, {'a': 1})
@ -132,7 +132,7 @@ class TestProxyRepoWrapping(test_utils.BaseTestCase):
if result is None:
self.assertTrue(proxy_result is None)
else:
self.assertTrue(isinstance(proxy_result, FakeProxy))
self.assertIsInstance(proxy_result, FakeProxy)
self.assertEqual(proxy_result.base, result)
self.assertEqual(proxy_result.args, tuple())
self.assertEqual(proxy_result.kwargs, {'a': 1})
@ -184,7 +184,7 @@ class TestImageFactory(test_utils.BaseTestCase):
proxy_kwargs={'dog': 'bark'})
self.factory.result = 'stark'
image = proxy_factory.new_image(a=1, b='two')
self.assertTrue(isinstance(image, FakeProxy))
self.assertIsInstance(image, FakeProxy)
self.assertEqual(image.base, 'stark')
self.assertEqual(self.factory.kwargs, {'a': 1, 'b': 'two'})
@ -220,7 +220,7 @@ class TestImageMembershipFactory(test_utils.BaseTestCase):
member_proxy_kwargs={'a': 1})
self.factory.result = 'tyrion'
membership = proxy_factory.new_image_member('jaime', 'cersei')
self.assertTrue(isinstance(membership, FakeProxy))
self.assertIsInstance(membership, FakeProxy)
self.assertEqual(membership.base, 'tyrion')
self.assertEqual(membership.kwargs, {'a': 1})
self.assertEqual(self.factory.image, 'jaime')
@ -249,7 +249,7 @@ class TestImageMembershipFactory(test_utils.BaseTestCase):
self.factory.result = 'tyrion'
image = FakeProxy2('jaime')
membership = proxy_factory.new_image_member(image, 'cersei')
self.assertTrue(isinstance(membership, FakeProxy))
self.assertIsInstance(membership, FakeProxy)
self.assertEqual(membership.base, 'tyrion')
self.assertEqual(membership.kwargs, {'b': 2})
self.assertEqual(self.factory.image, 'jaime')
@ -280,7 +280,7 @@ class TestImage(test_utils.BaseTestCase):
member_repo_proxy_kwargs={'a': 10})
self.image.result = 'corn'
member_repo = proxy_image.get_member_repo()
self.assertTrue(isinstance(member_repo, FakeProxy))
self.assertIsInstance(member_repo, FakeProxy)
self.assertEqual(member_repo.base, 'corn')
@ -326,5 +326,5 @@ class TestTaskFactory(test_utils.BaseTestCase):
input=self.fake_input,
owner=self.fake_owner
)
self.assertTrue(isinstance(task, FakeProxy))
self.assertIsInstance(task, FakeProxy)
self.assertEqual(task.base, 'fake_task')

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

@ -306,7 +306,7 @@ class ImageCacheTestCase(object):
with self.cache.driver.open_for_write(image_id) as cache_file:
raise IOError
except Exception as e:
self.assertEqual(type(e), IOError)
self.assertIsInstance(e, IOError)
self.assertFalse(self.cache.is_cached(image_id),
"Image %s was cached!" % image_id)
# make sure it has tidied up

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

@ -1002,7 +1002,7 @@ class TestMigrations(test_utils.BaseTestCase):
for r in records:
md = r['meta_data']
d = pickle.loads(md)
self.assertEqual(type(d), dict)
self.assertIsInstance(d, dict)
def _check_030(self, engine, data):
table = "tasks"

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

@ -161,12 +161,12 @@ class TestImageNotifications(utils.BaseTestCase):
def test_image_get(self):
image = self.image_repo_proxy.get(UUID1)
self.assertTrue(isinstance(image, glance.notifier.ImageProxy))
self.assertIsInstance(image, glance.notifier.ImageProxy)
self.assertEqual(image.image, 'image_from_get')
def test_image_list(self):
images = self.image_repo_proxy.list()
self.assertTrue(isinstance(images[0], glance.notifier.ImageProxy))
self.assertIsInstance(images[0], glance.notifier.ImageProxy)
self.assertEqual(images[0].image, 'images_from_list')
def test_image_get_data_notification(self):

8
glance/tests/unit/test_policy.py
View File

@ -230,7 +230,7 @@ class TestImagePolicy(test_utils.BaseTestCase):
image_repo = glance.api.policy.ImageRepoProxy(self.image_repo_stub,
{}, self.policy)
output = image_repo.get(UUID1)
self.assertTrue(isinstance(output, glance.api.policy.ImageProxy))
self.assertIsInstance(output, glance.api.policy.ImageProxy)
self.assertEqual(output.image, 'image_from_get')
self.policy.enforce.assert_called_once_with({}, "get_image", {})
@ -246,7 +246,7 @@ class TestImagePolicy(test_utils.BaseTestCase):
{}, self.policy)
images = image_repo.list()
for i, image in enumerate(images):
self.assertTrue(isinstance(image, glance.api.policy.ImageProxy))
self.assertIsInstance(image, glance.api.policy.ImageProxy)
self.assertEqual(image.image, 'image_from_list_%d' % i)
self.policy.enforce.assert_called_once_with({}, "get_images", {})
@ -396,7 +396,7 @@ class TestTaskPolicy(test_utils.BaseTestCase):
self.policy
)
output = task_repo.get(UUID1)
self.assertTrue(isinstance(output, glance.api.policy.TaskProxy))
self.assertIsInstance(output, glance.api.policy.TaskProxy)
self.assertEqual(output.task, 'task_from_get')
def test_get_tasks_not_allowed(self):
@ -419,7 +419,7 @@ class TestTaskPolicy(test_utils.BaseTestCase):
)
tasks = task_repo.list()
for i, task in enumerate(tasks):
self.assertTrue(isinstance(task, glance.api.policy.TaskProxy))
self.assertIsInstance(task, glance.api.policy.TaskProxy)
self.assertEqual(task.task, 'task_from_list_%d' % i)
def test_add_task_not_allowed(self):

18
glance/tests/unit/test_s3_store.py
View File

@ -190,8 +190,7 @@ class TestStore(base.StoreClearingUnitTest):
def fake_S3Connection_init(*args, **kwargs):
expected_cls = boto.s3.connection.OrdinaryCallingFormat
self.assertTrue(isinstance(kwargs.get('calling_format'),
expected_cls))
self.assertIsInstance(kwargs.get('calling_format'), expected_cls)
self.stubs.Set(boto.s3.connection.S3Connection, '__init__',
fake_S3Connection_init)
@ -205,8 +204,7 @@ class TestStore(base.StoreClearingUnitTest):
def fake_S3Connection_init(*args, **kwargs):
expected_cls = boto.s3.connection.SubdomainCallingFormat
self.assertTrue(isinstance(kwargs.get('calling_format'),
expected_cls))
self.assertIsInstance(kwargs.get('calling_format'), expected_cls)
self.stubs.Set(boto.s3.connection.S3Connection, '__init__',
fake_S3Connection_init)
@ -404,14 +402,14 @@ class TestStore(base.StoreClearingUnitTest):
def test_calling_format_path(self):
self.config(s3_store_bucket_url_format='path')
self.assertTrue(isinstance(glance.store.s3.get_calling_format(),
boto.s3.connection.OrdinaryCallingFormat))
self.assertIsInstance(glance.store.s3.get_calling_format(),
boto.s3.connection.OrdinaryCallingFormat)
def test_calling_format_subdomain(self):
self.config(s3_store_bucket_url_format='subdomain')
self.assertTrue(isinstance(glance.store.s3.get_calling_format(),
boto.s3.connection.SubdomainCallingFormat))
self.assertIsInstance(glance.store.s3.get_calling_format(),
boto.s3.connection.SubdomainCallingFormat)
def test_calling_format_default(self):
self.assertTrue(isinstance(glance.store.s3.get_calling_format(),
boto.s3.connection.SubdomainCallingFormat))
self.assertIsInstance(glance.store.s3.get_calling_format(),
boto.s3.connection.SubdomainCallingFormat)

6
glance/tests/unit/test_store_base.py
View File

@ -39,17 +39,17 @@ class TestStoreBase(test_base.StoreClearingUnitTest):
exc = Exception('error message')
ret = store_base._exception_to_unicode(exc)
self.assertEqual(unicode, type(ret))
self.assertIsInstance(ret, unicode)
self.assertEqual(ret, 'error message')
exc = Exception('\xa5 error message')
ret = store_base._exception_to_unicode(exc)
self.assertEqual(unicode, type(ret))
self.assertIsInstance(ret, unicode)
self.assertEqual(ret, ' error message')
exc = FakeException('\xa5 error message')
ret = store_base._exception_to_unicode(exc)
self.assertEqual(unicode, type(ret))
self.assertIsInstance(ret, unicode)
self.assertEqual(ret, _("Caught '%(exception)s' exception.") %
{'exception': 'FakeException'})

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

@ -120,9 +120,9 @@ class VersionNegotiationTest(base.IsolatedUnitTest):
def test_request_url_v2_3_unsupported(self):
request = webob.Request.blank('/v2.3/images')
resp = self.middleware.process_request(request)
self.assertTrue(isinstance(resp, versions.Controller))
self.assertIsInstance(resp, versions.Controller)
def test_request_url_v3_unsupported(self):
request = webob.Request.blank('/v3/images')
resp = self.middleware.process_request(request)
self.assertTrue(isinstance(resp, versions.Controller))
self.assertIsInstance(resp, versions.Controller)

2
glance/tests/utils.py
View File

@ -567,7 +567,7 @@ class UUIDTestCase(testtools.TestCase):
def test_generate_uuid(self):
uuid_string = utils.generate_uuid()
self.assertTrue(isinstance(uuid_string, str))
self.assertIsInstance(uuid_string, str)
self.assertEqual(len(uuid_string), 36)
# make sure there are 4 dashes
self.assertEqual(len(uuid_string.replace('-', '')), 32)