From a48f64d09640b9d65918ede2447a322ea6ce0c81 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Wed, 2 Jul 2014 12:25:00 +0200 Subject: [PATCH] Fix isinstance assertions self.assertIsInstance is preferred over assert(isinstance(..)). See feedback in: https://review.openstack.org/#/c/102754/1/neutron/tests/unit/test_extension_security_group.py Change-Id: I9dd6141d8f25961eb42a390b45e6d94d482afc1c --- neutron/tests/unit/test_extension_security_group.py | 2 +- neutron/tests/unit/test_neutron_manager.py | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/neutron/tests/unit/test_extension_security_group.py b/neutron/tests/unit/test_extension_security_group.py index b3864725dd1..69999153ebf 100644 --- a/neutron/tests/unit/test_extension_security_group.py +++ b/neutron/tests/unit/test_extension_security_group.py @@ -1429,7 +1429,7 @@ class TestConvertIPPrefixToCIDR(base.BaseTestCase): class TestConvertProtocol(base.BaseTestCase): def test_convert_numeric_protocol(self): - assert(isinstance(ext_sg.convert_protocol('2'), str)) + self.assertIsInstance(ext_sg.convert_protocol('2'), str) def test_convert_bad_protocol(self): for val in ['bad', '256', '-1']: diff --git a/neutron/tests/unit/test_neutron_manager.py b/neutron/tests/unit/test_neutron_manager.py index 9ae0e932144..3c8dc712a40 100644 --- a/neutron/tests/unit/test_neutron_manager.py +++ b/neutron/tests/unit/test_neutron_manager.py @@ -56,9 +56,8 @@ class NeutronManagerTestCase(base.BaseTestCase): mgr = manager.NeutronManager.get_instance() plugin = mgr.get_service_plugins()[constants.DUMMY] - self.assertTrue( - isinstance(plugin, - (dummy_plugin.DummyServicePlugin, types.ClassType)), + self.assertIsInstance( + plugin, (dummy_plugin.DummyServicePlugin, types.ClassType), "loaded plugin should be of type neutronDummyPlugin") def test_service_plugin_by_name_is_loaded(self): @@ -67,9 +66,8 @@ class NeutronManagerTestCase(base.BaseTestCase): mgr = manager.NeutronManager.get_instance() plugin = mgr.get_service_plugins()[constants.DUMMY] - self.assertTrue( - isinstance(plugin, - (dummy_plugin.DummyServicePlugin, types.ClassType)), + self.assertIsInstance( + plugin, (dummy_plugin.DummyServicePlugin, types.ClassType), "loaded plugin should be of type neutronDummyPlugin") def test_multiple_plugins_specified_for_service_type(self):