openstack
/
heat
Code Issues Proposed changes

Merge "Change assertTrue(isinstance()) by optimal assert"

This commit is contained in:
Jenkins 2015-11-03 04:25:57 +00:00 committed by Gerrit Code Review
parent 5916bb0a0e acce2b685d
commit 1af66c5da2
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)