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

diff --git a/neutron/tests/unit/test_extension_security_group.py b/neutron/tests/unit/test_extension_security_group.py
index b3864725dd150be9e6f749f033d4f2f770610a78..69999153ebf07162445b049efd9e80d44eb372ad 100644 (file)
--- 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 9ae0e9321440331e9fef0940a9d8139d9a6b1bb0..3c8dc712a400ab15cdc56b66e1c74fdf121e6771 100644 (file)
--- 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):