openstack
/
heat
Code Issues Proposed changes

Change assertTrue(isinstance()) by optimal assert 

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

Closes-bug: #1268480
Change-Id: I9532fa65a939767e13e0917a77d4698bf74d3ca6
This commit is contained in:
Bertrand Lallau 2015-10-28 22:17:27 +01:00 committed by Bertrand Lallau
parent 9fcfdf8558
commit acce2b685d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/tests/clients/test_clients.py
View File

@ -341,7 +341,7 @@ class TestClientPluginsInitialise(common.HeatTestCase):
self.assertEqual(con, plugin.context)
self.assertIsNone(plugin._client)
self.assertTrue(clients.has_client(plugin_name))
self.assertTrue(isinstance(plugin.service_types, list))
self.assertIsInstance(plugin.service_types, list)
self.assertTrue(len(plugin.service_types) >= 1,
'service_types is not defined for plugin')

2
heat/tests/test_function.py
View File

@ -139,7 +139,7 @@ class ResolveTest(common.HeatTestCase):
result = function.resolve(func)
self.assertEqual('wibble', result)
self.assertTrue(isinstance(result, str))
self.assertIsInstance(result, str)
def test_resolve_dict(self):
func = TestFunction(None, 'foo', ['bar', 'baz'])

2
heat/tests/test_template.py
View File

@ -634,7 +634,7 @@ class TemplateTest(common.HeatTestCase):
p_snippet = {"Ref": "baz"}
parsed = tmpl.parse(stk, p_snippet)
self.assertTrue(isinstance(parsed, cfn_funcs.ParamRef))
self.assertIsInstance(parsed, cfn_funcs.ParamRef)
def test_select_from_list(self):
tmpl = template.Template(empty_template)