From acce2b685deba80874abc0b411b0ef6f2401fc92 Mon Sep 17 00:00:00 2001 From: Bertrand Lallau Date: Wed, 28 Oct 2015 22:17:27 +0100 Subject: [PATCH] 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 --- heat/tests/clients/test_clients.py | 2 +- heat/tests/test_function.py | 2 +- heat/tests/test_template.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/heat/tests/clients/test_clients.py b/heat/tests/clients/test_clients.py index 9d49b13100..a83550a510 100644 --- a/heat/tests/clients/test_clients.py +++ b/heat/tests/clients/test_clients.py @@ -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') diff --git a/heat/tests/test_function.py b/heat/tests/test_function.py index 1180fffb7e..e34412fc2e 100644 --- a/heat/tests/test_function.py +++ b/heat/tests/test_function.py @@ -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']) diff --git a/heat/tests/test_template.py b/heat/tests/test_template.py index 0e8b6064c9..aeb482c3a7 100644 --- a/heat/tests/test_template.py +++ b/heat/tests/test_template.py @@ -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)